Mercurial > hg > mercurial-crew-with-dirclash

changeset 3964:2308c39b9521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make it possible to use changectx to create a filectx
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 25 Dec 2006 17:43:44 +0100
parents ba45041827a2
children 2e5161335e65
files mercurial/context.py tests/test-git-export
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -125,16 +125,18 @@ class filectx(object):
         self._repo = repo
         self._path = path
 
-        assert changeid is not None or fileid is not None
+        assert (changeid is not None
+                or fileid is not None
+                or changectx is not None)
 
         if filelog:
             self._filelog = filelog
-        if changectx:
-            self._changectx = changectx
-            self._changeid = changectx.node()
 
         if fileid is None:
-            self._changeid = changeid
+            if changectx is None:
+                self._changeid = changeid
+            else:
+                self._changectx = changectx
         else:
             self._fileid = fileid