This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7200

histedit: restore hex nodeids to be 12 digits long
ClosedPublic

Authored by martinvonz on Nov 2 2019, 12:49 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb27cf9f52194: histedit: restore hex nodeids to be 12 digits long
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 2 2019, 12:49 AM
martinvonz added a commit: rHGb27cf9f52194: histedit: restore hex nodeids to be 12 digits long.Nov 2 2019, 1:37 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb27cf9f52194: histedit: restore hex nodeids to be 12 digits long (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (4 lines)

Diff 17498

hgext/histedit.py

rule = rules[pos] rule = rules[pos]
ctx = rule.ctx ctx = rule.ctx
win.box() win.box()
maxy, maxx = win.getmaxyx() maxy, maxx = win.getmaxyx()
length = maxx - 3 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]) win.addstr(1, 1, line[:length])
line = b"user: %s" % ctx.user() line = b"user: %s" % ctx.user()
win.addstr(2, 1, line[:length]) win.addstr(2, 1, line[:length])
bms = repo.nodebookmarks(ctx.node()) bms = repo.nodebookmarks(ctx.node())
line = b"bookmark: %s" % b' '.join(bms) line = b"bookmark: %s" % b' '.join(bms)
win.addstr(3, 1, line[:length]) win.addstr(3, 1, line[:length])
win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx)) win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx))
y = y + 1 y = y + 1
break break
win.addstr(y, fnx, _trunc_head(line1, fnmaxx)) win.addstr(y, fnx, _trunc_head(line1, fnmaxx))
y = y + 1 y = y + 1
conflicts = rule.conflicts conflicts = rule.conflicts
if len(conflicts) > 0: 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 conflictstr = b"changed files overlap with %s" % conflictstr
else: else:
conflictstr = b'no overlap' conflictstr = b'no overlap'
win.addstr(y, 1, conflictstr[:length]) win.addstr(y, 1, conflictstr[:length])
win.noutrefresh() win.noutrefresh()
def helplines(mode): def helplines(mode):