Show More
@@ -90,8 +90,7 b' class unionrevlog(revlog.revlog):' | |||||
90 | elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: |
|
90 | elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: | |
91 | return self.baserevdiff(rev1, rev2) |
|
91 | return self.baserevdiff(rev1, rev2) | |
92 |
|
92 | |||
93 |
return mdiff.textdiff(self.revision(self. |
|
93 | return mdiff.textdiff(self.revision(rev1), self.revision(rev2)) | |
94 | self.revision(self.node(rev2))) |
|
|||
95 |
|
94 | |||
96 | def revision(self, nodeorrev, raw=False): |
|
95 | def revision(self, nodeorrev, raw=False): | |
97 | """return an uncompressed revision of a given node or revision |
|
96 | """return an uncompressed revision of a given node or revision |
@@ -40,12 +40,6 b' New errors are not allowed. Warnings are' | |||||
40 | > policy = os.environ.get('HGMODULEPOLICY', policy) |
|
40 | > policy = os.environ.get('HGMODULEPOLICY', policy) | |
41 | use encoding.environ instead (py3) |
|
41 | use encoding.environ instead (py3) | |
42 | Skipping mercurial/statprof.py it has no-che?k-code (glob) |
|
42 | Skipping mercurial/statprof.py it has no-che?k-code (glob) | |
43 | mercurial/unionrepo.py:93: |
|
|||
44 | > return mdiff.textdiff(self.revision(self.node(rev1)), |
|
|||
45 | don't covert rev to node before passing to revision(nodeorrev) |
|
|||
46 | mercurial/unionrepo.py:94: |
|
|||
47 | > self.revision(self.node(rev2))) |
|
|||
48 | don't covert rev to node before passing to revision(nodeorrev) |
|
|||
49 | [1] |
|
43 | [1] | |
50 |
|
44 | |||
51 | @commands in debugcommands.py should be in alphabetical order. |
|
45 | @commands in debugcommands.py should be in alphabetical order. |
General Comments 0
You need to be logged in to leave comments.
Login now