Patchwork D7200: histedit: restore hex nodeids to be 12 digits long

login
register
mail settings
Submitter phabricator
Date Nov. 2, 2019, 4:49 a.m.
Message ID <differential-rev-PHID-DREV-vy75hp7uokbtj3jxcmk7-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/42680/
State Superseded
Headers show

Comments

phabricator - Nov. 2, 2019, 4:49 a.m.
martinvonz created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I accidentally switched from 12 digits to 40 digits while making the
  code py3-compatible. Thanks to Yuya for noticing.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




To: martinvonz, durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -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'