Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmutil.py @ 38895:a01200b25da6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shortest: use 'x' prefix to disambiguate from revnum if configured Differential Revision: https://phab.mercurial-scm.org/D4042
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 16 Apr 2018 23:49:38 -0700
parents 7848f284b211
children ad88726d6982
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sun Apr 29 10:07:40 2018 -0700
+++ b/mercurial/scmutil.py	Mon Apr 16 23:49:38 2018 -0700
@@ -490,6 +490,12 @@
 
     def disambiguate(prefix):
         """Disambiguate against revnums."""
+        if repo.ui.configbool('experimental', 'revisions.prefixhexnode'):
+            if mayberevnum(repo, prefix):
+                return 'x' + prefix
+            else:
+                return prefix
+
         hexnode = hex(node)
         for length in range(len(prefix), len(hexnode) + 1):
             prefix = hexnode[:length]