Show More
@@ -885,13 +885,11 b' class revlog(object):' | |||
|
885 | 885 | |
|
886 | 886 | def revdiff(self, rev1, rev2): |
|
887 | 887 | """return or calculate a delta between two revisions""" |
|
888 | b1 = self.base(rev1) | |
|
889 | b2 = self.base(rev2) | |
|
890 | if b1 == b2 and rev1 + 1 == rev2: | |
|
888 | if rev1 + 1 == rev2 and self.base(rev1) == self.base(rev2): | |
|
891 | 889 | return self.chunk(rev2) |
|
892 | else: | |
|
893 |
|
|
|
894 |
|
|
|
890 | ||
|
891 | return mdiff.textdiff(self.revision(self.node(rev1)), | |
|
892 | self.revision(self.node(rev2))) | |
|
895 | 893 | |
|
896 | 894 | def revision(self, node): |
|
897 | 895 | """return an uncompressed revision of a given""" |
General Comments 0
You need to be logged in to leave comments.
Login now