This is an archive of the discontinued Mercurial Phabricator instance.

Differential D928

test-strip: make test compatible with chg
ClosedPublic

Authored by singhsrb on Oct 3 2017, 8:01 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG40b6d25ed2d5: test-strip: make test compatible with chg
Summary

The test was using reposetup which had the logic for stripping
commits. This leads to a situation where if the reposetup was called twice for
an extension (which can happen with chg running), the stripped node would not
be found the second time. Therefore, this commit changes the test to put the
stripping logic inside commands instead of the reposetup. This ensures that the
stripping logic is invoked only when the command is invoked and thus, avoids
any problems.

Test Plan

Ran the test 'test-strip.t' with and without the '--chg' option.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

singhsrb created this revision.Oct 3 2017, 8:01 PM
quark accepted this revision.Oct 3 2017, 8:06 PM
quark added a subscriber: quark.

Thanks!

Closed by commit rHG40b6d25ed2d5: test-strip: make test compatible with chg (authored by singhsrb). · Explain WhyOct 4 2017, 9:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-strip.t (26 lines)

Diff 2409

tests/test-strip.t

> EOS > EOS
$ cp -R . ../scmutilcleanup $ cp -R . ../scmutilcleanup
$ hg up -C I $ hg up -C I
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 3 >> I $ echo 3 >> I
$ cat > $TESTTMP/delayedstrip.py <<EOF $ cat > $TESTTMP/delayedstrip.py <<EOF
> from __future__ import absolute_import > from __future__ import absolute_import
> from mercurial import commands, repair > from mercurial import commands, registrar, repair
> def reposetup(ui, repo): > cmdtable = {}
> command = registrar.command(cmdtable)
> @command('testdelayedstrip')
> def testdelayedstrip(ui, repo):
> def getnodes(expr): > def getnodes(expr):
> return [repo.changelog.node(r) for r in repo.revs(expr)] > return [repo.changelog.node(r) for r in repo.revs(expr)]
> with repo.wlock(): > with repo.wlock():
> with repo.lock(): > with repo.lock():
> with repo.transaction('delayedstrip'): > with repo.transaction('delayedstrip'):
> repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J') > repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J')
> repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I') > repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I')
> commands.commit(ui, repo, message='J', date='0 0') > commands.commit(ui, repo, message='J', date='0 0')
> EOF > EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/delayedstrip.py $ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py
warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22 warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob) saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob)
$ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
@ 6:2f2d51af6205 J @ 6:2f2d51af6205 J
| |
o 3:08ebfeb61bac I o 3:08ebfeb61bac I
| |
| o 5:64a8289d2492 F | o 5:64a8289d2492 F
| | | |
| o 2:7fb047a69f22 E | o 2:7fb047a69f22 E
> hg bookmark -i -r $i b-$i > hg bookmark -i -r $i b-$i
> done > done
$ hg bookmark -i -r E 'b-F@divergent1' $ hg bookmark -i -r E 'b-F@divergent1'
$ hg bookmark -i -r H 'b-F@divergent2' $ hg bookmark -i -r H 'b-F@divergent2'
$ hg bookmark -i -r G 'b-F@divergent3' $ hg bookmark -i -r G 'b-F@divergent3'
$ cp -R . ../scmutilcleanup.obsstore $ cp -R . ../scmutilcleanup.obsstore
$ cat > $TESTTMP/scmutilcleanup.py <<EOF $ cat > $TESTTMP/scmutilcleanup.py <<EOF
> from mercurial import scmutil > from mercurial import registrar, scmutil
> def reposetup(ui, repo): > cmdtable = {}
> command = registrar.command(cmdtable)
> @command('testnodescleanup')
> def testnodescleanup(ui, repo):
> def nodes(expr): > def nodes(expr):
> return [repo.changelog.node(r) for r in repo.revs(expr)] > return [repo.changelog.node(r) for r in repo.revs(expr)]
> def node(expr): > def node(expr):
> return nodes(expr)[0] > return nodes(expr)[0]
> with repo.wlock(): > with repo.wlock():
> with repo.lock(): > with repo.lock():
> with repo.transaction('delayedstrip'): > with repo.transaction('delayedstrip'):
> mapping = {node('F'): [node('F2')], > mapping = {node('F'): [node('F2')],
> node('D'): [node('D2')], > node('D'): [node('D2')],
> node('G'): [node('G2')]} > node('G'): [node('G2')]}
> scmutil.cleanupnodes(repo, mapping, 'replace') > scmutil.cleanupnodes(repo, mapping, 'replace')
> scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace') > scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace')
> EOF > EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60 warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob) saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob)
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 8:1473d4b996d1 G2 b-F@divergent3 b-G o 8:1473d4b996d1 G2 b-F@divergent3 b-G
| |
| o 7:d11b3456a873 F2 b-F | o 7:d11b3456a873 F2 b-F
| | | |
| o 5:5cb05ba470a7 H | o 5:5cb05ba470a7 H
|/| |/|
| o 3:7fb047a69f22 E b-F@divergent1 | o 3:7fb047a69f22 E b-F@divergent1
$ cd $TESTTMP/scmutilcleanup.obsstore $ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> stabilization=all > stabilization=all
> stabilization.track-operation=1 > stabilization.track-operation=1
> EOF > EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 12:1473d4b996d1 G2 b-F@divergent3 b-G o 12:1473d4b996d1 G2 b-F@divergent3 b-G
| |
| o 11:d11b3456a873 F2 b-F | o 11:d11b3456a873 F2 b-F
| | | |
| o 8:5cb05ba470a7 H | o 8:5cb05ba470a7 H
|/| |/|