equal
deleted
inserted
replaced
875 p._filelog = getlog(p.path()) |
875 p._filelog = getlog(p.path()) |
876 |
876 |
877 return pl |
877 return pl |
878 |
878 |
879 # use linkrev to find the first changeset where self appeared |
879 # use linkrev to find the first changeset where self appeared |
880 if self.rev() != self.linkrev(): |
880 base = self |
881 base = self.filectx(self.filenode()) |
881 introrev = self.introrev() |
882 else: |
882 if self.rev() != introrev: |
883 base = self |
883 base = filectx(self._repo, self._path, filelog=self.filelog(), |
|
884 fileid=self.filenode(), changeid=introrev) |
884 |
885 |
885 # This algorithm would prefer to be recursive, but Python is a |
886 # This algorithm would prefer to be recursive, but Python is a |
886 # bit recursion-hostile. Instead we do an iterative |
887 # bit recursion-hostile. Instead we do an iterative |
887 # depth-first search. |
888 # depth-first search. |
888 |
889 |