This is an archive of the discontinued Mercurial Phabricator instance.

Differential D43

tests: add messages about new obsoleted changestes
ClosedPublic

Authored by mitrandir on Jul 11 2017, 12:12 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Commits
rFBHGXcf1b4ae2088d: tests: add messages about new obsoleted changestes
Summary

Diff Detail

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

Event Timeline

quark accepted this revision.Jul 11 2017, 12:27 PM
This revision is now accepted and ready to land.Jul 11 2017, 12:27 PM
mitrandir closed this revision.Jul 11 2017, 1:25 PM

Revision Contents
Changeset List

Diff 59

tests/test-pull-createmarkers.t

remote: d5895ab36037 add e remote: d5895ab36037 add e
remote: 4 new changesets from the server will be downloaded remote: 4 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 1 changes to 4 files (+1 heads) added 4 changesets with 1 changes to 4 files (+1 heads)
3 new obsolescence markers 3 new obsolescence markers
updating bookmark master updating bookmark master
obsoleted 3 changesets
Here we strip commits 6, 7, 8 to simulate what happens with landcastle, the Here we strip commits 6, 7, 8 to simulate what happens with landcastle, the
push doesn't directly go to the server push doesn't directly go to the server
$ hg strip 6 $ hg strip 6
saved backup bundle to $TESTTMP/client/.hg/strip-backup/d446b1b2be43-516f7371-backup.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/d446b1b2be43-516f7371-backup.hg (glob)
We update to commit 1 to avoid keeping 2, 3, and 4 visible with inhibit We update to commit 1 to avoid keeping 2, 3, and 4 visible with inhibit

tests/test-pushrebase.t

remote: 9467a8ee5d0d b => k remote: 9467a8ee5d0d b => k
remote: e73acfaeee82 b => foobar remote: e73acfaeee82 b => foobar
remote: 4 new changesets from the server will be downloaded remote: 4 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 2 changes to 4 files (+1 heads) added 4 changesets with 2 changes to 4 files (+1 heads)
2 new obsolescence markers 2 new obsolescence markers
obsoleted 2 changesets
$ hg pull $ hg pull
pulling from ssh://user@dummy/server pulling from ssh://user@dummy/server
searching for changes searching for changes
no changes found no changes found
$ hg debugobsolete | sort $ hg debugobsolete | sort
9467a8ee5d0d993ba68d94946c9d4a3cae8d31ff 0d76868c25e6789734c06e056f235e1fa223da74 * (glob) 9467a8ee5d0d993ba68d94946c9d4a3cae8d31ff 0d76868c25e6789734c06e056f235e1fa223da74 * (glob)
e73acfaeee82005b2379f82efb73123cbb74a733 d53a62ed14be0980584e1f92f9c47031ef806a62 * (glob) e73acfaeee82005b2379f82efb73123cbb74a733 d53a62ed14be0980584e1f92f9c47031ef806a62 * (glob)
pushing 1 changset: pushing 1 changset:
d5e255ef74f8 c d5e255ef74f8 c
1 new changeset from the server will be downloaded 1 new changeset from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 1 files added 1 changesets with 0 changes to 1 files
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets
$ hg log -G -T '{desc} {date|isodate}' $ hg log -G -T '{desc} {date|isodate}'
o c 2001-09-09 01:46 +0000 o c 2001-09-09 01:46 +0000
| |
| @ c 1970-01-01 00:00 +0000 | @ c 1970-01-01 00:00 +0000
| | | |
o | b 1970-01-01 00:00 +0000 o | b 1970-01-01 00:00 +0000
|/ |/
o a 1970-01-01 00:00 +0000 o a 1970-01-01 00:00 +0000
c1392466a61e y c1392466a61e y
4514adb1f536 merge 4514adb1f536 merge
3 new changesets from the server will be downloaded 3 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 3 changesets with 0 changes to 2 files (+1 heads) added 3 changesets with 0 changes to 2 files (+1 heads)
3 new obsolescence markers 3 new obsolescence markers
obsoleted 3 changesets
$ cd .. $ cd ..
Test pushrebase on merge commit where master is on the p2 side Test pushrebase on merge commit where master is on the p2 side
$ hg init p2mergeserver $ hg init p2mergeserver
$ cd p2mergeserver $ cd p2mergeserver
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
6c337f0241b3 add c 6c337f0241b3 add c
4ae459502279 merge b and c 4ae459502279 merge b and c
3 new changesets from the server will be downloaded 3 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 0 changes to 2 files added 2 changesets with 0 changes to 2 files
2 new obsolescence markers 2 new obsolescence markers
obsoleted 2 changesets
$ hg -R ../p2mergeserver log -G -T '{rev}: {desc}' $ hg -R ../p2mergeserver log -G -T '{rev}: {desc}'
o 3: merge b and c o 3: merge b and c
|\ |\
| o 2: add c | o 2: add c
| |
o 1: add b o 1: add b
| |
@ 0: add a @ 0: add a
pushing 1 changset: pushing 1 changset:
045279cde9f0 a2 045279cde9f0 a2
2 new changesets from the server will be downloaded 2 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 1 changes to 2 files (+1 heads) added 2 changesets with 1 changes to 2 files (+1 heads)
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets
$ hg up tip -q $ hg up tip -q
$ log --hidden $ log --hidden
@ a2 [public:722505d780e3] @ a2 [public:722505d780e3]
| |
o b [public:d2ae7f538514] o b [public:d2ae7f538514]
| |
| x a2 [draft:045279cde9f0] | x a2 [draft:045279cde9f0]
|/ |/
o a [public:cb9a9f314b8b] o a [public:cb9a9f314b8b]