This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5610

absorb: add a pycompat.bytestr() to fix --edit-lines functionality on Python 3
ClosedPublic

Authored by durin42 on Jan 16 2019, 11:34 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc146651a78e1: absorb: add a pycompat.bytestr() to fix --edit-lines functionality on Python 3

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

durin42 created this revision.Jan 16 2019, 11:34 AM
pulkit accepted this revision.Jan 16 2019, 11:55 AM
Closed by commit rHGc146651a78e1: absorb: add a pycompat.bytestr() to fix --edit-lines functionality on Python 3 (authored by durin42). · Explain WhyJan 16 2019, 12:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mhgext/absorb.py (3 lines)

Diff 13290

contrib/python3-whitelist

test-abort-checkin.t test-abort-checkin.t
test-absorb-edit-lines.t
test-absorb-filefixupstate.py test-absorb-filefixupstate.py
test-absorb-phase.t test-absorb-phase.t
test-absorb-rename.t test-absorb-rename.t
test-absorb-strip.t test-absorb-strip.t
test-absorb.t test-absorb.t
test-add.t test-add.t
test-addremove-similar.t test-addremove-similar.t
test-addremove.t test-addremove.t

hgext/absorb.py

leftpadpos = 4 leftpadpos = 4
colonpos = leftpadpos + len(visiblefctxs) + 1 colonpos = leftpadpos + len(visiblefctxs) + 1
for l in mdiff.splitnewlines(editedtext): for l in mdiff.splitnewlines(editedtext):
if l.startswith('HG:'): if l.startswith('HG:'):
continue continue
if l[colonpos - 1:colonpos + 2] != ' : ': if l[colonpos - 1:colonpos + 2] != ' : ':
raise error.Abort(_('malformed line: %s') % l) raise error.Abort(_('malformed line: %s') % l)
linecontent = l[colonpos + 2:] linecontent = l[colonpos + 2:]
for i, ch in enumerate(l[leftpadpos:colonpos - 1]): for i, ch in enumerate(
pycompat.bytestr(l[leftpadpos:colonpos - 1])):
if ch == 'y': if ch == 'y':
contents[visiblefctxs[i][0]] += linecontent contents[visiblefctxs[i][0]] += linecontent
# chunkstats is hard to calculate if anything changes, therefore # chunkstats is hard to calculate if anything changes, therefore
# set them to just a simple value (1, 1). # set them to just a simple value (1, 1).
if editedtext != editortext: if editedtext != editortext:
self.chunkstats = [1, 1] self.chunkstats = [1, 1]
return contents return contents