This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2243

histedit: fix silly bug that was unpacking a bytestr before writing it
ClosedPublic

Authored by durin42 on Feb 13 2018, 7:13 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG28830ba50687: histedit: fix silly bug that was unpacking a bytestr before writing it
Summary

I have this foggy notion that popbuffer() might have returned a list
in the past, but it doesn't anymore, and this was breaking on Python

  1. As a bonus, it's probably a ton faster on Python 2 now.

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.Feb 13 2018, 7:13 PM
indygreg accepted this revision.Feb 13 2018, 11:56 PM
This revision is now accepted and ready to land.Feb 13 2018, 11:56 PM
Closed by commit rHG28830ba50687: histedit: fix silly bug that was unpacking a bytestr before writing it (authored by durin42). · Explain WhyFeb 14 2018, 12:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)

Diff 5679

hgext/histedit.py

repo = self.repo repo = self.repo
rulectx = repo[self.node] rulectx = repo[self.node]
repo.ui.pushbuffer(error=True, labeled=True) repo.ui.pushbuffer(error=True, labeled=True)
hg.update(repo, self.state.parentctxnode, quietempty=True) hg.update(repo, self.state.parentctxnode, quietempty=True)
stats = applychanges(repo.ui, repo, rulectx, {}) stats = applychanges(repo.ui, repo, rulectx, {})
repo.dirstate.setbranch(rulectx.branch()) repo.dirstate.setbranch(rulectx.branch())
if stats and stats[3] > 0: if stats and stats[3] > 0:
buf = repo.ui.popbuffer() buf = repo.ui.popbuffer()
repo.ui.write(*buf) repo.ui.write(buf)
raise error.InterventionRequired( raise error.InterventionRequired(
_('Fix up the change (%s %s)') % _('Fix up the change (%s %s)') %
(self.verb, node.short(self.node)), (self.verb, node.short(self.node)),
hint=_('hg histedit --continue to resume')) hint=_('hg histedit --continue to resume'))
else: else:
repo.ui.popbuffer() repo.ui.popbuffer()
def continuedirty(self): def continuedirty(self):