This is an archive of the discontinued Mercurial Phabricator instance.

Differential D661

amend: fix test-treemanifest-treeonly.t after amend's redundant commit removal
ClosedPublic

Authored by singhsrb on Sep 8 2017, 1:46 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
quark
Group Reviewers
Restricted Project
Commits
rFBHGX8eecb87feb9a: amend: fix test-treemanifest-treeonly.t after amend's redundant commit removal
Summary

cmdutil.amend was changed recently to get rid of the redundant commit
during the amend operation. As a result, we need to update this test as it was
aware of the redundant commit. This commit achieves the same.

Test Plan

Executed the test after the changes.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Sep 8 2017, 1:46 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 8 2017, 1:46 PM
singhsrb added a comment.Sep 8 2017, 1:50 PM

This test was added recently and hence, was not considered during D590.

quark accepted this revision.Sep 8 2017, 2:20 PM
This revision is now accepted and ready to land.Sep 8 2017, 2:20 PM
Closed by commit rFBHGX8eecb87feb9a: amend: fix test-treemanifest-treeonly.t after amend's redundant commit removal (authored by singhsrb). · Explain WhySep 12 2017, 11:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 1683

tests/test-treemanifest-treeonly.t

rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000 0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000 1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
Tree-only amend Tree-only amend
$ echo >> subdir/x $ echo >> subdir/x
$ hg commit --amend $ hg commit --amend
saved backup bundle to $TESTTMP/client/.hg/strip-backup/779a137458d0-42851918-amend.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg (glob)
# Two sets of packs were added (temp commit + amend commit) # amend commit was added
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*16 (re) \s*12 (re)
# No manifest revlog revision was added # No manifest revlog revision was added
$ hg debugindex -m --config treemanifest.treeonly=False $ hg debugindex -m --config treemanifest.treeonly=False
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000 0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000 1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
# Delete the original commits packs # Delete the original commits packs
$ rm -rf .hg/store/packs/manifests/26653c55cb54ab20aeb188315d736fb2ece04cd1* $ rm -rf .hg/store/packs/manifests/26653c55cb54ab20aeb188315d736fb2ece04cd1*
$ rm -rf .hg/store/packs/manifests/2a492611dfb8fbde1652e7e54fa1f64b82bd8ff7* $ rm -rf .hg/store/packs/manifests/2a492611dfb8fbde1652e7e54fa1f64b82bd8ff7*
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*12 (re) \s*8 (re)
Test looking at the tree from inside the bundle Test looking at the tree from inside the bundle
$ hg log -r tip -vp -R $TESTTMP/client/.hg/strip-backup/779a137458d0-42851918-amend.hg --pager=off $ hg log -r tip -vp -R $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg --pager=off
changeset: 5:5fb87f99628c changeset: 4:779a137458d0
tag: tip tag: tip
parent: 0:2278cc8c6ce6
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: subdir/x files: subdir/x
description: description:
temporary amend commit for 779a137458d0 tree only commit
diff -r 779a137458d0 -r 5fb87f99628c subdir/x diff -r 2278cc8c6ce6 -r 779a137458d0 subdir/x
--- a/subdir/x Thu Jan 01 00:00:00 1970 +0000 --- a/subdir/x Thu Jan 01 00:00:00 1970 +0000
+++ b/subdir/x Thu Jan 01 00:00:00 1970 +0000 +++ b/subdir/x Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +1,3 @@ @@ -1,1 +1,2 @@
x x
t +t
+
Test unbundling the original commit Test unbundling the original commit
# Bring the original commit back from the bundle # Bring the original commit back from the bundle
$ hg unbundle $TESTTMP/client/.hg/strip-backup/779a137458d0-42851918-amend.hg $ hg unbundle $TESTTMP/client/.hg/strip-backup/779a137458d0-0b309c3a-amend.hg
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads) added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads .' to see heads, 'hg merge' to merge) (run 'hg heads .' to see heads, 'hg merge' to merge)
# Verify the packs were brought back and the data is accessible # Verify the packs were brought back and the data is accessible
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*16 (re) \s*12 (re)
$ hg log -r tip --stat $ hg log -r tip --stat
changeset: 5:5fb87f99628c changeset: 4:779a137458d0
tag: tip tag: tip
parent: 0:2278cc8c6ce6
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: temporary amend commit for 779a137458d0 summary: tree only commit
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
Test pulling new commits from a hybrid server Test pulling new commits from a hybrid server
$ cd ../master $ cd ../master
$ echo x >> subdir/x $ echo x >> subdir/x
$ hg commit -qAm 'modify subdir/x' $ hg commit -qAm 'modify subdir/x'
$ hg debugindex -m --config treemanifest.treeonly=False $ hg debugindex -m --config treemanifest.treeonly=False
rev offset length delta linkrev nodeid p1 p2 rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000 0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000 1 51 51 -1 1 c0196aba344d 85b359fdb09e 000000000000
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
$ hg log -r tip --stat --pager=off $ hg log -r tip --stat --pager=off
2 trees fetched over * (glob) 2 trees fetched over * (glob)
changeset: 6:2937cde31c19 changeset: 5:2937cde31c19
tag: tip tag: tip
parent: 0:2278cc8c6ce6 parent: 0:2278cc8c6ce6
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: modify subdir/x summary: modify subdir/x
subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 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 rebasing treeonly commits Test rebasing treeonly commits
$ hg rebase -d 6 -b 2 $ hg rebase -d 5 -b 2
rebasing 2:4b702090309e "hybrid flat+tree commit" rebasing 2:4b702090309e "hybrid flat+tree commit"
merging subdir/x merging subdir/x
warning: conflicts while merging subdir/x! (edit, then use 'hg resolve --mark') warning: conflicts while merging subdir/x! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ printf "x\nx\nh\n" > subdir/x $ printf "x\nx\nh\n" > subdir/x
$ hg resolve --mark subdir/x $ hg resolve --mark subdir/x
(no more unresolved files) (no more unresolved files)