Mercurial > hg > gitweb
diff mercurial/context.py @ 3964:2308c39b9521
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 | 2b8825c94c5a |
| children | 2e5161335e65 |
line wrap: on
line diff
--- a/mercurial/context.py Mon Dec 25 13:37:00 2006 +0100 +++ b/mercurial/context.py Mon Dec 25 17:43:44 2006 +0100 @@ -125,16 +125,18 @@ 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