equal
deleted
inserted
replaced
1232 return rev - 1 |
1232 return rev - 1 |
1233 |
1233 |
1234 def revdiff(self, rev1, rev2): |
1234 def revdiff(self, rev1, rev2): |
1235 """return or calculate a delta between two revisions""" |
1235 """return or calculate a delta between two revisions""" |
1236 if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
1236 if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
1237 return str(self._chunk(rev2)) |
1237 return bytes(self._chunk(rev2)) |
1238 |
1238 |
1239 return mdiff.textdiff(self.revision(rev1), |
1239 return mdiff.textdiff(self.revision(rev1), |
1240 self.revision(rev2)) |
1240 self.revision(rev2)) |
1241 |
1241 |
1242 def revision(self, nodeorrev, _df=None, raw=False): |
1242 def revision(self, nodeorrev, _df=None, raw=False): |