Mercurial > hg
changeset 43376:b27cf9f52194 stable
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
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 01 Nov 2019 21:46:34 -0700 |
| parents | c2c3ee8794dd |
| children | aaa046919043 |
| files | hgext/histedit.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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'