##// END OF EJS Templates
adjustlinkrev: handle 'None' value as source...
Pierre-Yves David -
r24411:5a12ef61 stable
parent child Browse files
Show More
@@ -774,9 +774,15 b' class basefilectx(object):'
774 # hack to reuse ancestor computation when searching for renames
774 # hack to reuse ancestor computation when searching for renames
775 memberanc = getattr(self, '_ancestrycontext', None)
775 memberanc = getattr(self, '_ancestrycontext', None)
776 iteranc = None
776 iteranc = None
777 revs = [srcrev]
777 if srcrev is None:
778 # wctx case, used by workingfilectx during mergecopy
779 revs = [p.rev() for p in self._repo[None].parents()]
780 inclusive = True # we skipped the real (revless) source
781 else:
782 revs = [srcrev]
778 if memberanc is None:
783 if memberanc is None:
779 memberanc = iteranc = cl.ancestors(revs, lkr, inclusive=inclusive)
784 memberanc = iteranc = cl.ancestors(revs, lkr,
785 inclusive=inclusive)
780 # check if this linkrev is an ancestor of srcrev
786 # check if this linkrev is an ancestor of srcrev
781 if lkr not in memberanc:
787 if lkr not in memberanc:
782 if iteranc is None:
788 if iteranc is None:
General Comments 0
You need to be logged in to leave comments. Login now