Mercurial > hg > hgforest

changeset 85:54afa0660a0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix localrepo.workingctx() changed in changectx(None)
author Patrick Mezard <pmezard@gmail.com>
date Sat, 25 Oct 2008 14:54:54 +0200
parents af8268c7a99b
children 2c26a72ce357
files forest.py test-forest.out
diffstat 2 files changed, 35 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/forest.py	Sat Oct 25 14:23:57 2008 +0200
+++ b/forest.py	Sat Oct 25 14:54:54 2008 +0200
@@ -524,7 +524,10 @@
 
         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())]
 
--- a/test-forest.out	Sat Oct 25 14:23:57 2008 +0200
+++ b/test-forest.out	Sat Oct 25 14:54:54 2008 +0200
@@ -37,18 +37,23 @@
 
 # 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
@@ -193,6 +198,7 @@
 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
@@ -200,6 +206,7 @@
 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]
@@ -208,6 +215,7 @@
 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]
@@ -216,6 +224,7 @@
 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]
@@ -224,6 +233,7 @@
 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]
@@ -362,6 +372,7 @@
 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]
@@ -370,6 +381,7 @@
 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
@@ -583,6 +595,7 @@
 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]
@@ -591,6 +604,7 @@
 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]
@@ -599,6 +613,7 @@
 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]
@@ -607,6 +622,7 @@
 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
 
 .
@@ -619,6 +635,7 @@
 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]
@@ -627,6 +644,7 @@
 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]
@@ -635,6 +653,7 @@
 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
 
 .
@@ -672,6 +691,7 @@
 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]
@@ -680,6 +700,7 @@
 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]
@@ -688,6 +709,7 @@
 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]
@@ -696,6 +718,7 @@
 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]
@@ -704,6 +727,7 @@
 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
 
 .
@@ -756,12 +780,15 @@
 
 # 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]
@@ -771,6 +798,7 @@
 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
@@ -869,12 +897,15 @@
 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
 
 [.]