equal
deleted
inserted
replaced
754 pl.append(re) |
754 pl.append(re) |
755 acache[vertex] = pl |
755 acache[vertex] = pl |
756 return pl |
756 return pl |
757 |
757 |
758 a, b = (self._path, self._filenode), (fc2._path, fc2._filenode) |
758 a, b = (self._path, self._filenode), (fc2._path, fc2._filenode) |
759 v = ancestor.ancestor(a, b, parents) |
759 v = ancestor.genericancestor(a, b, parents) |
760 if v: |
760 if v: |
761 f, n = v |
761 f, n = v |
762 return filectx(self._repo, f, fileid=n, filelog=flcache[f]) |
762 return filectx(self._repo, f, fileid=n, filelog=flcache[f]) |
763 |
763 |
764 return None |
764 return None |