Mercurial > public > mercurial-scm > hg
comparison mercurial/unionrepo.py @ 31724:f1e0446e804c
unionrepo: avoid unnecessary node -> rev conversion
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 29 Mar 2017 16:28:51 -0700 |
parents | 854f9188e354 |
children | 634997248c97 |
comparison
equal
deleted
inserted
replaced
31723:2c4295773436 | 31724:f1e0446e804c |
---|---|
88 self.revlog2.rev(self.node(rev1)), | 88 self.revlog2.rev(self.node(rev1)), |
89 self.revlog2.rev(self.node(rev2))) | 89 self.revlog2.rev(self.node(rev2))) |
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.node(rev1)), | 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 |
98 number. | 97 number. |
99 """ | 98 """ |