Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: restore hex nodeids to be 12 digits long stable
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 01 Nov 2019 21:46:34 -0700
branchstable
changeset 43376 b27cf9f52194
parent 43375 c2c3ee8794dd
child 43377 aaa046919043
histedit: restore hex nodeids to be 12 digits long I accidentally switched from 12 digits to 40 digits while making the code py3-compatible. Thanks to Yuya for noticing. Differential Revision: https://phab.mercurial-scm.org/D7200
hgext/histedit.py file | annotate | diff | comparison | revisions 
--- a/hgext/histedit.py	Tue Oct 29 10:54:08 2019 -0700
+++ b/hgext/histedit.py	Fri Nov 01 21:46:34 2019 -0700
@@ -1402,7 +1402,7 @@
         maxy, maxx = win.getmaxyx()
         length = maxx - 3
 
-        line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex())
+        line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex()[:12])
         win.addstr(1, 1, line[:length])
 
         line = b"user:      %s" % ctx.user()
@@ -1432,7 +1432,7 @@
 
         conflicts = rule.conflicts
         if len(conflicts) > 0:
-            conflictstr = b','.join(map(lambda r: r.ctx.hex(), conflicts))
+            conflictstr = b','.join(map(lambda r: r.ctx.hex()[:12], conflicts))
             conflictstr = b"changed files overlap with %s" % conflictstr
         else:
             conflictstr = b'no overlap'
mercurial