Commits

Patrick Mézard  committed 54afa06

Fix localrepo.workingctx() changed in changectx(None)

  • Participants
  • Parent commits af8268c

Comments (0)

Files changed (2)

 
         def working_revs(self):
             """Returns the revision of the working copy."""
-            ctx = self.repo.workingctx()
+            try:
+                ctx = self.repo[None]
+            except TypeError:
+                ctx = self.repo.workingctx()
             parents = ctx.parents()
             return [node.hex(parents[0].node())]
 

File test-forest.out

 
 # fclone
 [.]
+updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [d/d/t]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [e/d]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t/t]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 # fsnap
 summary:     new line
 
 # fseed
+updating working directory
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [d/d/t]
 requesting all changes
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [e/d]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t/t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [tree1]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t/t]
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 # foutgoing
 adding manifests
 adding file changes
 added 1 changesets with 3 changes to 3 files
+updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [e/d]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t/t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 .
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t/t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 .
 adding manifests
 adding file changes
 added 1 changesets with 3 changes to 3 files
+updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [d/d/t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [e/d]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t/t]
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 .
 
 # fclone + mq
 [.]
+updating working directory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [d/d/t]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [e/d]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
 skipped: 't/t' has mq patches applied
 
 [t/t/.hg/patches]
+updating working directory
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 # fsnap + mq
 adding f
 adding f
 [.]
+updating working directory
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [a]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [b]
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [.]