This is an archive of the discontinued Mercurial Phabricator instance.

Differential D570

tests: remove orig file from a commit
ClosedPublic

Authored by durham on Aug 30 2017, 1:52 PM.
Tags
None
Subscribers
None

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGX2d54fc1a5172: tests: remove orig file from a commit
Summary

An orig file was getting added to a commit in a test accidentally, which makes
it harder to test the contents of that commit in a future diff. Let's purge that
file before we make the commit. This affects some of the later output because
the hash changes.

Diff Detail

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

Event Timeline

durham created this revision.Aug 30 2017, 1:52 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 30 2017, 1:52 PM
simonfar accepted this revision.Aug 31 2017, 7:31 AM
This revision is now accepted and ready to land.Aug 31 2017, 7:31 AM
Closed by commit rFBHGX2d54fc1a5172: tests: remove orig file from a commit (authored by durham). · Explain WhyAug 31 2017, 2:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-treemanifest-treeonly.t (31 lines)

Diff 1497

tests/test-treemanifest-treeonly.t

(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 2:4b702090309e "hybrid flat+tree commit" rebasing 2:4b702090309e "hybrid flat+tree commit"
saved backup bundle to $TESTTMP/client/.hg/strip-backup/4b702090309e-7a0f0c5f-rebase.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/4b702090309e-7a0f0c5f-rebase.hg (glob)
Test histedit treeonly commits Test histedit treeonly commits
$ hg up -q 38a88da6315b $ hg up -q 38a88da6315b
$ hg purge --config extensions.purge=
$ echo y > y $ echo y > y
$ hg commit -Aqm 'add y' $ hg commit -Aqm 'add y'
$ hg histedit --config extensions.histedit= --commands - <<EOF $ hg histedit --config extensions.histedit= --commands - <<EOF
> pick 0b82d7242702 add y > pick eea609e344ca add y
> pick 38a88da6315b hybrid flat+tree commit > pick 38a88da6315b hybrid flat+tree commit
> EOF > EOF
saved backup bundle to $TESTTMP/client/.hg/strip-backup/38a88da6315b-77d91db7-histedit.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/38a88da6315b-320da9c1-histedit.hg (glob)
$ hg log -l 2 -G -T '{desc}' $ hg log -l 2 -G -T '{desc}'
@ hybrid flat+tree commit @ hybrid flat+tree commit
| |
o add y o add y
| |
~ ~
Test peer-to-peer push/pull of tree only commits Test peer-to-peer push/pull of tree only commits
$ cd .. $ cd ..
$ clearcache $ clearcache
# TODO: Test tree only clone # TODO: Test tree only clone
$ hgcloneshallow ssh://user@dummy/master client2 -q $ hgcloneshallow ssh://user@dummy/master client2 -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ cd client2 $ cd client2
$ cp ../client/.hg/hgrc .hg/hgrc $ cp ../client/.hg/hgrc .hg/hgrc
# Test pulling from a treeonly peer # Test pulling from a treeonly peer
$ hg pull -r tip ssh://user@dummy/client --debug 2>&1 | egrep "(payload|treegroup)" $ hg pull -r tip ssh://user@dummy/client --debug 2>&1 | egrep "(payload|treegroup)"
bundle2-input-part: total payload size 980 bundle2-input-part: total payload size 823
bundle2-input-part: total payload size 171 bundle2-input-part: total payload size 171
bundle2-input-part: "b2x:treegroup2" (params: 3 mandatory) supported bundle2-input-part: "b2x:treegroup2" (params: 3 mandatory) supported
bundle2-input-part: total payload size 948 bundle2-input-part: total payload size 663
$ hg up tip $ hg up tip
2 trees fetched over * (glob) 2 trees fetched over * (glob)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G -l 3 -T '{desc}' --stat $ hg log -G -l 3 -T '{desc}\n' --stat
@ hybrid flat+tree commit subdir/x | 1 + @ hybrid flat+tree commit
| subdir/x | 1 +
| 1 files changed, 1 insertions(+), 0 deletions(-) | 1 files changed, 1 insertions(+), 0 deletions(-)
| |
o add y subdir/x.orig | 2 ++ o add y
| y | 1 + | y | 1 +
| 2 files changed, 3 insertions(+), 0 deletions(-) | 1 files changed, 1 insertions(+), 0 deletions(-)
| |
2 trees fetched over * (glob) 2 trees fetched over * (glob)
o modify subdir/x subdir/x | 1 + o modify subdir/x
| 1 files changed, 1 insertions(+), 0 deletions(-) | subdir/x | 1 +
~ ~ 1 files changed, 1 insertions(+), 0 deletions(-)
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
# Test pushing to a treeonly peer # Test pushing to a treeonly peer
$ echo y >> y $ echo y >> y
$ hg commit -qm "modify y" $ hg commit -qm "modify y"
1 trees fetched over * (glob) 1 trees fetched over * (glob)
$ hg push -f -r . ssh://user@dummy/client --debug 2>&1 | grep treegroup $ hg push -f -r . ssh://user@dummy/client --debug 2>&1 | grep treegroup
bundle2-output-part: "b2x:treegroup2" (params: 3 mandatory) streamed payload bundle2-output-part: "b2x:treegroup2" (params: 3 mandatory) streamed payload
$ cd .. $ cd ..
$ hgcloneshallow ssh://user@dummy/master client3 -q $ hgcloneshallow ssh://user@dummy/master client3 -q
$ cd client3 $ cd client3
$ cp ../client/.hg/hgrc .hg/hgrc $ cp ../client/.hg/hgrc .hg/hgrc
$ hg unbundle ../mybundle.hg $ hg unbundle ../mybundle.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 4 changes to 3 files added 3 changesets with 3 changes to 2 files
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg log -r 'tip^::tip' -G -T "{desc}\n" --stat $ hg log -r 'tip^::tip' -G -T "{desc}\n" --stat
o modify y o modify y
| y | 1 + | y | 1 +
| 1 files changed, 1 insertions(+), 0 deletions(-) | 1 files changed, 1 insertions(+), 0 deletions(-)
| |
o hybrid flat+tree commit o hybrid flat+tree commit
| subdir/x | 1 + | subdir/x | 1 +
~ 1 files changed, 1 insertions(+), 0 deletions(-) ~ 1 files changed, 1 insertions(+), 0 deletions(-)
TODO TODO
# Access the pre-tree commit # Access the pre-tree commit
# log -T "{manifest}" #TODO: edit templatekw.showmanifest # log -T "{manifest}" #TODO: edit templatekw.showmanifest