Patchwork D2145: py3: port ext-phase-report.py extension

login
register
mail settings
Submitter phabricator
Date Feb. 11, 2018, 10:57 p.m.
Message ID <differential-rev-PHID-DREV-ka5lkv5sbhfp6vtw3ima-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27589/
State Superseded
Headers show

Comments

phabricator - Feb. 11, 2018, 10:57 p.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The custom module importer doesn't run on Python files in the
  tests directory. So we need the source to be compatible with
  both Python 2 and 3.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/testlib/ext-phase-report.py

CHANGE DETAILS




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

Patch

diff --git a/tests/testlib/ext-phase-report.py b/tests/testlib/ext-phase-report.py
--- a/tests/testlib/ext-phase-report.py
+++ b/tests/testlib/ext-phase-report.py
@@ -5,18 +5,18 @@ 
 def reposetup(ui, repo):
 
     def reportphasemove(tr):
-        for rev, move in sorted(tr.changes['phases'].iteritems()):
+        for rev, move in sorted(tr.changes[b'phases'].items()):
             if move[0] is None:
-                ui.write(('test-debug-phase: new rev %d:  x -> %d\n'
+                ui.write((b'test-debug-phase: new rev %d:  x -> %d\n'
                           % (rev, move[1])))
             else:
-                ui.write(('test-debug-phase: move rev %d: %s -> %d\n'
+                ui.write((b'test-debug-phase: move rev %d: %d -> %d\n'
                           % (rev, move[0], move[1])))
 
     class reportphaserepo(repo.__class__):
         def transaction(self, *args, **kwargs):
             tr = super(reportphaserepo, self).transaction(*args, **kwargs)
-            tr.addpostclose('report-phase', reportphasemove)
+            tr.addpostclose(b'report-phase', reportphasemove)
             return tr
 
     repo.__class__ = reportphaserepo