equal
deleted
inserted
replaced
864 def revdiff(self, rev1, rev2): |
864 def revdiff(self, rev1, rev2): |
865 """return or calculate a delta between two revisions""" |
865 """return or calculate a delta between two revisions""" |
866 if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
866 if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
867 return str(self._chunk(rev2)) |
867 return str(self._chunk(rev2)) |
868 |
868 |
869 return mdiff.textdiff(self.revision(self.node(rev1)), |
869 return mdiff.textdiff(self.revision(rev1), |
870 self.revision(self.node(rev2))) |
870 self.revision(rev2)) |
871 |
871 |
872 def revision(self, nodeorrev): |
872 def revision(self, nodeorrev): |
873 """return an uncompressed revision of a given node or""" |
873 """return an uncompressed revision of a given node or""" |
874 if isinstance(nodeorrev, int): |
874 if isinstance(nodeorrev, int): |
875 rev = nodeorrev |
875 rev = nodeorrev |