This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3832

py3: add b'' prefixes in tests/test-obsolete-divergent.t
ClosedPublic

Authored by pulkit on Jun 25 2018, 6:33 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGafa96dd5a483: py3: add b'' prefixes in tests/test-obsolete-divergent.t
Summary

This makes the test pass on Python 3.

  1. skip-blame because just b'' prefixes.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jun 25 2018, 6:33 AM
Closed by commit rHGafa96dd5a483: py3: add b'' prefixes in tests/test-obsolete-divergent.t (authored by pulkit). · Explain WhyJun 25 2018, 8:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9277

contrib/python3-whitelist

test-newbranch.t test-newbranch.t
test-obshistory.t test-obshistory.t
test-obsmarker-template.t test-obsmarker-template.t
test-obsmarkers-effectflag.t test-obsmarkers-effectflag.t
test-obsolete-bundle-strip.t test-obsolete-bundle-strip.t
test-obsolete-changeset-exchange.t test-obsolete-changeset-exchange.t
test-obsolete-checkheads.t test-obsolete-checkheads.t
test-obsolete-distributed.t test-obsolete-distributed.t
test-obsolete-divergent.t
test-obsolete-tag-cache.t test-obsolete-tag-cache.t
test-pager.t test-pager.t
test-parents.t test-parents.t
test-parseindex2.py test-parseindex2.py
test-patch-offset.t test-patch-offset.t
test-patch.t test-patch.t
test-pathconflicts-merge.t test-pathconflicts-merge.t
test-pathconflicts-update.t test-pathconflicts-update.t

tests/test-obsolete-divergent.t

$ hg update -q B1 $ hg update -q B1
$ echo 3 >> B $ echo 3 >> B
$ hg commit --amend -m B2 $ hg commit --amend -m B2
$ cat > $TESTTMP/scmutilcleanup.py <<EOF $ cat > $TESTTMP/scmutilcleanup.py <<EOF
> from mercurial import registrar, scmutil > from mercurial import registrar, scmutil
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command('cleanup') > @command(b'cleanup')
> def cleanup(ui, repo): > def cleanup(ui, repo):
> def node(expr): > def node(expr):
> unfi = repo.unfiltered() > unfi = repo.unfiltered()
> rev = unfi.revs(expr).first() > rev = unfi.revs(expr).first()
> return unfi.changelog.node(rev) > return unfi.changelog.node(rev)
> with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): > with repo.wlock(), repo.lock(), repo.transaction(b'delayedstrip'):
> mapping = {node('desc(B1)'): [node('desc(B3)')], > mapping = {node(b'desc(B1)'): [node(b'desc(B3)')],
> node('desc(B3)'): [node('desc(B4)')]} > node(b'desc(B3)'): [node(b'desc(B4)')]}
> scmutil.cleanupnodes(repo, mapping, 'test') > scmutil.cleanupnodes(repo, mapping, b'test')
> EOF > EOF
$ rm .hg/localtags $ rm .hg/localtags
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
2 new content-divergent changesets 2 new content-divergent changesets
$ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
@ 5:1a2a9b5b0030 B2 content-divergent @ 5:1a2a9b5b0030 B2 content-divergent
| |