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

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 12:13 a.m.
Message ID <differential-rev-PHID-DREV-35dapsw4tq7y4xrflodr-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27861/
State Superseded
Headers show

Comments

phabricator - Feb. 14, 2018, 12:13 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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
  
  3. As a bonus, it's probably a ton faster on Python 2 now.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2243

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -491,7 +491,7 @@ 
         repo.dirstate.setbranch(rulectx.branch())
         if stats and stats[3] > 0:
             buf = repo.ui.popbuffer()
-            repo.ui.write(*buf)
+            repo.ui.write(buf)
             raise error.InterventionRequired(
                 _('Fix up the change (%s %s)') %
                 (self.verb, node.short(self.node)),