Patchwork D2248: tests: port fakemergerecord to python3

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 5:09 a.m.
Message ID <c68280e6eab3244c975f8405a1b7a1fb@localhost.localdomain>
Download mbox | patch
Permalink /patch/27876/
State Not Applicable
Headers show

Comments

phabricator - Feb. 14, 2018, 5:09 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdb2c091871d3: tests: port fakemergerecord to python3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2248?vs=5672&id=5683

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

AFFECTED FILES
  tests/fakemergerecord.py

CHANGE DETAILS




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

Patch

diff --git a/tests/fakemergerecord.py b/tests/fakemergerecord.py
--- a/tests/fakemergerecord.py
+++ b/tests/fakemergerecord.py
@@ -12,15 +12,15 @@ 
 cmdtable = {}
 command = registrar.command(cmdtable)
 
-@command('fakemergerecord',
-         [('X', 'mandatory', None, 'add a fake mandatory record'),
-          ('x', 'advisory', None, 'add a fake advisory record')], '')
+@command(b'fakemergerecord',
+         [(b'X', b'mandatory', None, b'add a fake mandatory record'),
+          (b'x', b'advisory', None, b'add a fake advisory record')], '')
 def fakemergerecord(ui, repo, *pats, **opts):
     with repo.wlock():
         ms = merge.mergestate.read(repo)
         records = ms._makerecords()
         if opts.get('mandatory'):
-            records.append(('X', 'mandatory record'))
+            records.append((b'X', b'mandatory record'))
         if opts.get('advisory'):
-            records.append(('x', 'advisory record'))
+            records.append((b'x', b'advisory record'))
         ms._writerecords(records)