martinvonz updated this revision to Diff 8283.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3309?vs=8260&id=8283

REVISION DETAIL
  https://phab.mercurial-scm.org/D3309

AFFECTED FILES
  hgext/eol.py
  hgext/histedit.py
  mercurial/context.py
  mercurial/scmutil.py

CHANGE DETAILS

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -434,8 +434,8 @@
         hexfunc = short
     return '%d:%s' % (rev, hexfunc(node))
 
-def resolvepartialhexnodeid(repo, prefix):
-    # Uses unfiltered repo because it's faster when then prefix is ambiguous/
+def resolvehexnodeidprefix(repo, prefix):
+    # Uses unfiltered repo because it's faster when prefix is ambiguous/
     # This matches the "shortest" template function.
     node = repo.unfiltered().changelog._partialmatch(prefix)
     if node is None:
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -392,7 +392,7 @@
     #  * If you know that "x" is a branch or in some other namespace,
     #    use the appropriate mechanism for that namespace
     #  * If you know that "x" is a hex nodeid prefix, use
-    #    repo[scmutil.resolvepartialhexnodeid(repo, x)]
+    #    repo[scmutil.resolvehexnodeidprefix(repo, x)]
     #  * If "x" is a string that can be any of the above, but you don't want
     #    to allow general revsets (perhaps because "x" may come from a remote
     #    user and the revset may be too costly), use scmutil.revsymbol(repo, x)
@@ -476,7 +476,7 @@
             except KeyError:
                 pass
 
-            self._node = scmutil.resolvepartialhexnodeid(repo, changeid)
+            self._node = scmutil.resolvehexnodeidprefix(repo, changeid)
             if self._node is not None:
                 self._rev = repo.changelog.rev(self._node)
                 changectxdeprecwarn(repo)
diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -443,7 +443,7 @@
         """ Verifies semantic correctness of the rule"""
         repo = self.repo
         ha = node.hex(self.node)
-        self.node = scmutil.resolvepartialhexnodeid(repo, ha)
+        self.node = scmutil.resolvehexnodeidprefix(repo, ha)
         if self.node is None:
             raise error.ParseError(_('unknown changeset %s listed') % ha[:12])
         self._verifynodeconstraints(prev, expected, seen)
diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -300,7 +300,7 @@
 hook = checkheadshook
 
 def preupdate(ui, repo, hooktype, parent1, parent2):
-    p1node = scmutil.resolvepartialhexnodeid(repo, parent1)
+    p1node = scmutil.resolvehexnodeidprefix(repo, parent1)
     repo.loadeol([p1node])
     return False
 



To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to