# HG changeset patch # User Jun Wu # Date 2017-03-29 23:28:51 # Node ID f1e0446e804c091378eb627e8fa9d2437fb75dbf # Parent 2c4295773436728343449c52c11fce4e02fbcc75 unionrepo: avoid unnecessary node -> rev conversion diff --git a/mercurial/unionrepo.py b/mercurial/unionrepo.py --- a/mercurial/unionrepo.py +++ b/mercurial/unionrepo.py @@ -90,8 +90,7 @@ class unionrevlog(revlog.revlog): elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: return self.baserevdiff(rev1, rev2) - return mdiff.textdiff(self.revision(self.node(rev1)), - self.revision(self.node(rev2))) + return mdiff.textdiff(self.revision(rev1), self.revision(rev2)) def revision(self, nodeorrev, raw=False): """return an uncompressed revision of a given node or revision diff --git a/tests/test-check-code.t b/tests/test-check-code.t --- a/tests/test-check-code.t +++ b/tests/test-check-code.t @@ -40,12 +40,6 @@ New errors are not allowed. Warnings are > policy = os.environ.get('HGMODULEPOLICY', policy) use encoding.environ instead (py3) Skipping mercurial/statprof.py it has no-che?k-code (glob) - mercurial/unionrepo.py:93: - > return mdiff.textdiff(self.revision(self.node(rev1)), - don't covert rev to node before passing to revision(nodeorrev) - mercurial/unionrepo.py:94: - > self.revision(self.node(rev2))) - don't covert rev to node before passing to revision(nodeorrev) [1] @commands in debugcommands.py should be in alphabetical order.