D3832: py3: add b'' prefixes in tests/test-obsolete-divergent.t
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Mon Jun 25 10:33:58 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This makes the test pass on Python 3.
1. skip-blame because just b'' prefixes.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3832
AFFECTED FILES
contrib/python3-whitelist
tests/test-obsolete-divergent.t
CHANGE DETAILS
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
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list