# HG changeset patch # User Pierre-Yves David # Date 1426834654 25200 # Node ID 5a12ef618c03fc06ad1728e2df7481b20ad656ba # Parent 86de531e07e1468645560f7386e048989bfd9d6d adjustlinkrev: handle 'None' value as source When the source rev value is 'None', the ctx is a working context. We cannot compute the ancestors from there so we directly skip to its parents. This will be necessary to allow 'None' value for '_descendantrev' itself necessary to make all contexts used in 'mergecopies' reuse the same '_ancestrycontext'. diff -r 86de531e07e1 -r 5a12ef618c03 mercurial/context.py --- a/mercurial/context.py Thu Mar 19 23:52:26 2015 -0700 +++ b/mercurial/context.py Thu Mar 19 23:57:34 2015 -0700 @@ -774,9 +774,15 @@ # hack to reuse ancestor computation when searching for renames memberanc = getattr(self, '_ancestrycontext', None) iteranc = None - revs = [srcrev] + if srcrev is None: + # wctx case, used by workingfilectx during mergecopy + revs = [p.rev() for p in self._repo[None].parents()] + inclusive = True # we skipped the real (revless) source + else: + revs = [srcrev] if memberanc is None: - memberanc = iteranc = cl.ancestors(revs, lkr, inclusive=inclusive) + memberanc = iteranc = cl.ancestors(revs, lkr, + inclusive=inclusive) # check if this linkrev is an ancestor of srcrev if lkr not in memberanc: if iteranc is None: