Patchwork D2248: tests: port fakemergerecord to python3

login
register
mail settings
Submitter phabricator
Date Feb. 14, 2018, 12:13 a.m.
Message ID <differential-rev-PHID-DREV-kgx4cemwbqgvvocdalzs-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27865/
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.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/fakemergerecord.py

CHANGE DETAILS




To: durin42, #hg-reviewers
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)