D7200: histedit: restore hex nodeids to be 12 digits long
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 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' 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
D7200: histedit: restore hex nodeids to be 12 digits long
Closed by commit rHGb27cf9f52194: histedit: restore hex nodeids to be 12 digits long (authored by martinvonz). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7200?vs=17497&id=17498 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7200/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7200 AFFECTED FILES hgext/histedit.py CHANGE DETAILS 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' 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
