This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7181

py3: make chistedit render
ClosedPublic

Authored by martinvonz on Oct 31 2019, 6:22 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd8215ff082da: py3: make chistedit render
rHGfec59bd11e00: py3: make chistedit render
rHG067d6c40d2b9: py3: make chistedit render
Summary

Now you can see the list of commits, but it crashes when you press a
key.

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.Oct 31 2019, 6:22 PM
indygreg added a subscriber: indygreg.Oct 31 2019, 10:39 PM
indygreg added inline comments.
hgext/histedit.py
1121

__bytes__ doesn't exist in Python 2. Did this patch regress Python 2?

martinvonz added inline comments.Nov 1 2019, 12:11 AM
hgext/histedit.py
1121

Oh, good point! I'll make sure to test it on Python 2 as well. Update coming soon.

martinvonz updated this revision to Diff 17428.Nov 1 2019, 12:16 AM
yuja added a subscriber: yuja.Nov 1 2019, 9:35 AM

+ return b"#%s %s %d:%s %s" % ((b'%d' % self.origpos).ljust(2),
+ action.ljust(6), r, h, desc)
+
+ bytes = str

__str__ = encoding.strmethod(__bytes__) can be used instead. __str__
of Python3 must return unicode string.

martinvonz added a comment.Nov 1 2019, 10:35 AM

Feel free to do that in flight. Otherwise I'll do it later today.

It won't matter in practice. We should of course have a separate method
explicitly for creating a line instead. But that's not for stable.

martinvonz updated this revision to Diff 17436.Nov 1 2019, 12:34 PM
indygreg accepted this revision.Nov 1 2019, 1:29 PM
This revision is now accepted and ready to land.Nov 1 2019, 1:29 PM
martinvonz added a commit: rHG067d6c40d2b9: py3: make chistedit render.Nov 1 2019, 1:29 PM
Closed by commit rHG067d6c40d2b9: py3: make chistedit render (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (22 lines)

Diff 17457

hgext/histedit.py

) )
from mercurial import ( from mercurial import (
bundle2, bundle2,
cmdutil, cmdutil,
context, context,
copies, copies,
destutil, destutil,
discovery, discovery,
encoding,
error, error,
exchange, exchange,
extensions, extensions,
hg, hg,
logcmdutil, logcmdutil,
merge as mergemod, merge as mergemod,
mergeutil, mergeutil,
node, node,
class histeditrule(object): class histeditrule(object):
def __init__(self, ctx, pos, action=b'pick'): def __init__(self, ctx, pos, action=b'pick'):
self.ctx = ctx self.ctx = ctx
self.action = action self.action = action
self.origpos = pos self.origpos = pos
self.pos = pos self.pos = pos
self.conflicts = [] self.conflicts = []
def __str__(self): def __bytes__(self):
indygregUnsubmitted
Not Done

__bytes__ doesn't exist in Python 2. Did this patch regress Python 2?

indygreg: `__bytes__` doesn't exist in Python 2. Did this patch regress Python 2?
martinvonzAuthorUnsubmitted
Done

Oh, good point! I'll make sure to test it on Python 2 as well. Update coming soon.

martinvonz: Oh, good point! I'll make sure to test it on Python 2 as well. Update coming soon.
# Some actions ('fold' and 'roll') combine a patch with a previous one. # Some actions ('fold' and 'roll') combine a patch with a previous one.
# Add a marker showing which patch they apply to, and also omit the # Add a marker showing which patch they apply to, and also omit the
# description for 'roll' (since it will get discarded). Example display: # description for 'roll' (since it will get discarded). Example display:
# #
# #10 pick 316392:06a16c25c053 add option to skip tests # #10 pick 316392:06a16c25c053 add option to skip tests
# #11 ^roll 316393:71313c964cc5 # #11 ^roll 316393:71313c964cc5
# #12 pick 316394:ab31f3973b0d include mfbt for mozilla-config.h # #12 pick 316394:ab31f3973b0d include mfbt for mozilla-config.h
# #13 ^fold 316395:14ce5803f4c3 fix warnings # #13 ^fold 316395:14ce5803f4c3 fix warnings
# #
# The carets point to the changeset being folded into ("roll this # The carets point to the changeset being folded into ("roll this
# changeset into the changeset above"). # changeset into the changeset above").
action = ACTION_LABELS.get(self.action, self.action) action = ACTION_LABELS.get(self.action, self.action)
h = self.ctx.hex()[0:12] h = self.ctx.hex()[0:12]
r = self.ctx.rev() r = self.ctx.rev()
desc = self.ctx.description().splitlines()[0].strip() desc = self.ctx.description().splitlines()[0].strip()
if self.action == b'roll': if self.action == b'roll':
desc = b'' desc = b''
return b"#{0:<2} {1:<6} {2}:{3} {4}".format( return b"#%s %s %d:%s %s" % ((b'%d' % self.origpos).ljust(2),
self.origpos, action, r, h, desc action.ljust(6), r, h, desc)
)
__str__ = encoding.strmethod(__bytes__)
def checkconflicts(self, other): def checkconflicts(self, other):
if other.pos > self.pos and other.origpos <= self.origpos: if other.pos > self.pos and other.origpos <= self.origpos:
if set(other.ctx.files()) & set(self.ctx.files()) != set(): if set(other.ctx.files()) & set(self.ctx.files()) != set():
self.conflicts.append(other) self.conflicts.append(other)
return self.conflicts return self.conflicts
if other in self.conflicts: if other in self.conflicts:
return commands return commands
def addln(win, y, x, line, color=None): def addln(win, y, x, line, color=None):
"""Add a line to the given window left padding but 100% filled with """Add a line to the given window left padding but 100% filled with
whitespace characters, so that the color appears on the whole line""" whitespace characters, so that the color appears on the whole line"""
maxy, maxx = win.getmaxyx() maxy, maxx = win.getmaxyx()
length = maxx - 1 - x length = maxx - 1 - x
line = (b"{0:<%d}" % length).format(str(line).strip())[:length] line = bytes(line).ljust(length)[:length]
if y < 0: if y < 0:
y = maxy + y y = maxy + y
if x < 0: if x < 0:
x = maxx + x x = maxx + x
if color: if color:
win.addstr(y, x, line, color) win.addstr(y, x, line, color)
else: else:
win.addstr(y, x, line) win.addstr(y, x, line)
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: {0}:{1:<12}".format(ctx.rev(), ctx) line = b"changeset: %d:%s" % (ctx.rev(), ctx.hex())
win.addstr(1, 1, line[:length]) win.addstr(1, 1, line[:length])
line = b"user: {0}".format(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: {0}".format(b' '.join(bms)) line = b"bookmark: %s" % b' '.join(bms)
win.addstr(3, 1, line[:length]) win.addstr(3, 1, line[:length])
line = b"summary: {0}".format(ctx.description().splitlines()[0]) line = b"summary: %s" % (ctx.description().splitlines()[0])
win.addstr(4, 1, line[:length]) win.addstr(4, 1, line[:length])
line = b"files: " line = b"files: "
win.addstr(5, 1, line) win.addstr(5, 1, line)
fnx = 1 + len(line) fnx = 1 + len(line)
fnmaxx = length - fnx + 1 fnmaxx = length - fnx + 1
y = 5 y = 5
fnmaxn = maxy - (1 + y) - 1 fnmaxn = maxy - (1 + y) - 1
files = ctx.files() files = ctx.files()
for i, line1 in enumerate(files): for i, line1 in enumerate(files):
if len(files) > fnmaxn and i == fnmaxn - 1: if len(files) > fnmaxn and i == fnmaxn - 1:
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: str(r.ctx), conflicts)) conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts))
conflictstr = b"changed files overlap with {0}".format(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):
if mode == MODE_PATCH: if mode == MODE_PATCH: