From patchwork Mon Jun 25 12:01:25 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D3832: py3: add b'' prefixes in tests/test-obsolete-divergent.t
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 32408
Message-Id: <45ad86e2198122ccf08ae6dc9d6f15fc@localhost.localdomain>
To: mercurial-devel@mercurial-scm.org
Date: Mon, 25 Jun 2018 12:01:25 +0000

This revision was automatically updated to reflect the committed changes.
Closed by commit rHGafa96dd5a483: py3: add b&#039;&#039; prefixes in tests/test-obsolete-divergent.t (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3832?vs=9277&id=9279

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

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-obsolete-divergent.t

CHANGE DETAILS




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

diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t
+++ b/tests/test-obsolete-divergent.t
@@ -704,16 +704,16 @@
   > from mercurial import registrar, scmutil
   > cmdtable = {}
   > command = registrar.command(cmdtable)
-  > @command('cleanup')
+  > @command(b'cleanup')
   > def cleanup(ui, repo):
   >     def node(expr):
   >         unfi = repo.unfiltered()
   >         rev = unfi.revs(expr).first()
   >         return unfi.changelog.node(rev)
-  >     with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'):
-  >         mapping = {node('desc(B1)'): [node('desc(B3)')],
-  >                    node('desc(B3)'): [node('desc(B4)')]}
-  >         scmutil.cleanupnodes(repo, mapping, 'test')
+  >     with repo.wlock(), repo.lock(), repo.transaction(b'delayedstrip'):
+  >         mapping = {node(b'desc(B1)'): [node(b'desc(B3)')],
+  >                    node(b'desc(B3)'): [node(b'desc(B4)')]}
+  >         scmutil.cleanupnodes(repo, mapping, b'test')
   > EOF
 
   $ rm .hg/localtags
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -338,6 +338,7 @@
 test-obsolete-changeset-exchange.t
 test-obsolete-checkheads.t
 test-obsolete-distributed.t
+test-obsolete-divergent.t
 test-obsolete-tag-cache.t
 test-pager.t
 test-parents.t