# HG changeset patch
# User Boris Feld <boris.f...@octobus.net>
# Date 1506807440 -3600
# Sat Sep 30 22:37:20 2017 +0100
# Node ID 10194608efe05c44ebcd86e618a313942a65a167
# Parent 74998bff9b03f613236c22422b0305a25834ef9e
# EXP-Topic obs-tests
# Available At https://bitbucket.org/octobus/mercurial-devel/
# hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
10194608efe0
test: add an extra case for obsolescence distributed case
This changeset introduces a new documented test case for a distributed
obsolescence scenario. The scenario involves a simple case where some
obsolescence markers are retrieved before the changeset they affect. See the
test case documentation for details.
We also test variants where the changesets are added from a bundle.
diff --git a/tests/test-obsolete-distributed.t
b/tests/test-obsolete-distributed.t
--- a/tests/test-obsolete-distributed.t
+++ b/tests/test-obsolete-distributed.t
@@ -10,6 +10,8 @@
$ unset EMAIL
$ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH << EOF
+ > [extensions]
+ > rebase =
> [experimental]
> evolution = all
> [phases]
@@ -205,3 +207,284 @@
$ hg debugobsolete
e1b46f0f979f52748347ff8729c59f2ef56e6fe2
7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000)
{'user': 'server'}
7f6b0a6f5c25345a83870963efd827c1798a5959
e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 0 (Thu Jan 01 00:00:00 1970 +0000)
{'user': 'client'}
+ $ cd ..
+
+Check getting changesets after getting the markers
+=================================================
+
+This test case covers the scenario where commits are received -after- we
+received some obsolescence markers turning them obsolete.
+
+For example, we pull some successors from a repository (with associated
+predecessors marker chain) and then later we pull some intermediate
+precedessors changeset from another repository. Obsolescence markers must
+apply to the intermediate changeset. They have to be obsolete (and hidden).
+
+Avoiding pulling the changeset in the first place is a tricky decision because
+there could be non-obsolete ancestors that need to be pulled, but the
+discovery cannot currently find these (this is not the case in this tests). In
+addition, we could also have to pull the changeset because they have children.
+In this case, they would not be hidden (yet) because of the orphan descendant,
+but they would still have to be obsolete. (This is not tested in this case
+either).
+
+ $ mkdir distributed-chain-building
+ $ cd distributed-chain-building
+ $ hg init server
+ $ cd server
+ $ cat << EOF >> .hg/hgrc
+ > [ui]
+ > username = server
+ > EOF
+ $ mkcommit ROOT
+ $ cd ..
+ $ hg clone server repo-Alice
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cat << EOF >> repo-Alice/.hg/hgrc
+ > [ui]
+ > username = alice
+ > EOF
+ $ hg clone server repo-Bob
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cat << EOF >> repo-Bob/.hg/hgrc
+ > [ui]
+ > username = bob
+ > EOF
+ $ hg clone server repo-Celeste
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cat << EOF >> repo-Celeste/.hg/hgrc
+ > [ui]
+ > username = celeste
+ > EOF
+
+Create some changesets locally
+
+ $ cd repo-Alice
+ $ mkcommit c_A0
+ $ mkcommit c_B0
+ $ cd ..
+
+Bob pulls from Alice and rewrites them
+
+ $ cd repo-Bob
+ $ hg pull ../repo-Alice
+ pulling from ../repo-Alice
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ (run 'hg update' to get a working copy)
+ $ hg up 'desc("c_A")'
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg commit --amend -m 'c_A1'
+ $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with
the rebase
+ rebasing 2:ef908e42ce65 "c_B0"
+ $ hg up
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg commit --amend -m 'c_B1'
+ $ hg log -G
+ @ 5:956063ac4557 c_B1
+ |
+ o 3:5b5708a437f2 c_A1
+ |
+ o 0:e82fb8d02bbf ROOT
+
+ $ hg log -G --hidden
+ @ 5:956063ac4557 c_B1
+ |
+ | x 4:5ffb9e311b35 c_B0 [rewritten using amend as 5:956063ac4557 by bob (at
1970-01-01 00:00 +0000); ]
+ |/
+ o 3:5b5708a437f2 c_A1
+ |
+ | x 2:ef908e42ce65 c_B0 [rewritten using rebase as 4:5ffb9e311b35 by bob
(at 1970-01-01 00:00 +0000); ]
+ | |
+ | x 1:d33b0a3a6464 c_A0 [rewritten using amend as 3:5b5708a437f2 by bob (at
1970-01-01 00:00 +0000); ]
+ |/
+ o 0:e82fb8d02bbf ROOT
+
+ $ hg debugobsolete
+ d33b0a3a64647d79583526be8107802b1f9fedfa
5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ ef908e42ce65ef57f970d799acaddde26f58a4cc
5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'bob'}
+ 5ffb9e311b35f6ab6f76f667ca5d6e595645481b
956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ $ cd ..
+
+Celeste pulls from Bob and rewrites them again
+
+ $ cd repo-Celeste
+ $ hg pull ../repo-Bob
+ pulling from ../repo-Bob
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ 3 new obsolescence markers
+ (run 'hg update' to get a working copy)
+ $ hg up 'desc("c_A")'
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg commit --amend -m 'c_A2'
+ $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with
the rebase
+ rebasing 2:956063ac4557 "c_B1"
+ $ hg up
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg commit --amend -m 'c_B2'
+ $ hg log -G
+ @ 5:77ae25d99ff0 c_B2
+ |
+ o 3:9866d64649a5 c_A2
+ |
+ o 0:e82fb8d02bbf ROOT
+
+ $ hg log -G --hidden
+ @ 5:77ae25d99ff0 c_B2
+ |
+ | x 4:3cf8de21cc22 c_B1 [rewritten using amend as 5:77ae25d99ff0 by celeste
(at 1970-01-01 00:00 +0000); ]
+ |/
+ o 3:9866d64649a5 c_A2
+ |
+ | x 2:956063ac4557 c_B1 [rewritten using rebase as 4:3cf8de21cc22 by
celeste (at 1970-01-01 00:00 +0000); ]
+ | |
+ | x 1:5b5708a437f2 c_A1 [rewritten using amend as 3:9866d64649a5 by celeste
(at 1970-01-01 00:00 +0000); ]
+ |/
+ o 0:e82fb8d02bbf ROOT
+
+ $ hg debugobsolete
+ 5ffb9e311b35f6ab6f76f667ca5d6e595645481b
956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ d33b0a3a64647d79583526be8107802b1f9fedfa
5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ ef908e42ce65ef57f970d799acaddde26f58a4cc
5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'bob'}
+ 5b5708a437f27665db42c5a261a539a1bcb2a8c2
9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 956063ac4557828781733b2d5677a351ce856f59
3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'celeste'}
+ 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3
77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+
+Celeste now pushes to the server
+
+(note: it would be enough to just have direct Celeste -> Alice exchange here.
+However using a central server seems more common)
+
+ $ hg push
+ pushing to
$TESTTMP/distributed-chain-building/distributed-chain-building/server (glob)
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ 6 new obsolescence markers
+ $ cd ..
+
+Now Alice pulls from the server, then from Bob
+
+Alice first retrieves the new evolution of its changesets and associated
markers
+from the server (note: could be from Celeste directly)
+
+ $ cd repo-Alice
+ $ hg up 'desc(ROOT)'
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ hg pull
+ pulling from
$TESTTMP/distributed-chain-building/distributed-chain-building/server (glob)
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 0 changes to 2 files (+1 heads)
+ 6 new obsolescence markers
+ obsoleted 2 changesets
+ (run 'hg heads' to see heads)
+ $ hg debugobsolete
+ 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3
77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5b5708a437f27665db42c5a261a539a1bcb2a8c2
9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5ffb9e311b35f6ab6f76f667ca5d6e595645481b
956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ 956063ac4557828781733b2d5677a351ce856f59
3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'celeste'}
+ d33b0a3a64647d79583526be8107802b1f9fedfa
5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ ef908e42ce65ef57f970d799acaddde26f58a4cc
5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'bob'}
+
+Then, she pulls from Bob, pulling predecessors of the changeset she has
+already pulled. The changesets are not obsoleted in the Bob repo yet. Their
+successors do not exist in Bob repository yet.
+
+ $ hg pull ../repo-Bob
+ pulling from ../repo-Bob
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 0 changes to 2 files (+1 heads)
+ (run 'hg heads' to see heads)
+ $ hg log -G
+ o 4:77ae25d99ff0 c_B2
+ |
+ o 3:9866d64649a5 c_A2
+ |
+ @ 0:e82fb8d02bbf ROOT
+
+ $ hg debugobsolete
+ 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3
77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5b5708a437f27665db42c5a261a539a1bcb2a8c2
9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5ffb9e311b35f6ab6f76f667ca5d6e595645481b
956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ 956063ac4557828781733b2d5677a351ce856f59
3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'celeste'}
+ d33b0a3a64647d79583526be8107802b1f9fedfa
5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ ef908e42ce65ef57f970d799acaddde26f58a4cc
5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'bob'}
+
+Same tests, but change coming from a bundle
+(testing with a bundle is interesting because absolutely no discovery or
+decision is made in that case, so receiving the changesets are not an option).
+
+ $ hg rollback
+ repository tip rolled back to revision 4 (undo pull)
+ $ hg log -G
+ o 4:77ae25d99ff0 c_B2
+ |
+ o 3:9866d64649a5 c_A2
+ |
+ @ 0:e82fb8d02bbf ROOT
+
+ $ hg debugobsolete
+ 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3
77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5b5708a437f27665db42c5a261a539a1bcb2a8c2
9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5ffb9e311b35f6ab6f76f667ca5d6e595645481b
956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ 956063ac4557828781733b2d5677a351ce856f59
3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'celeste'}
+ d33b0a3a64647d79583526be8107802b1f9fedfa
5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ ef908e42ce65ef57f970d799acaddde26f58a4cc
5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'bob'}
+ $ hg -R ../repo-Bob bundle ../step-1.hg
+ searching for changes
+ 2 changesets found
+ $ hg unbundle ../step-1.hg
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 0 changes to 2 files (+1 heads)
+ (run 'hg heads' to see heads)
+ $ hg log -G
+ o 4:77ae25d99ff0 c_B2
+ |
+ o 3:9866d64649a5 c_A2
+ |
+ @ 0:e82fb8d02bbf ROOT
+
+ $ hg log -G --hidden
+ x 6:956063ac4557 c_B1 [rewritten using amend, rebase as 4:77ae25d99ff0 by
celeste (at 1970-01-01 00:00 +0000); ]
+ |
+ x 5:5b5708a437f2 c_A1 [rewritten using amend as 3:9866d64649a5 by celeste
(at 1970-01-01 00:00 +0000); ]
+ |
+ | o 4:77ae25d99ff0 c_B2
+ | |
+ | o 3:9866d64649a5 c_A2
+ |/
+ | x 2:ef908e42ce65 c_B0 [rewritten using amend, rebase as 6:956063ac4557 by
bob (at 1970-01-01 00:00 +0000); ]
+ | |
+ | x 1:d33b0a3a6464 c_A0 [rewritten using amend as 5:5b5708a437f2 by bob (at
1970-01-01 00:00 +0000); ]
+ |/
+ @ 0:e82fb8d02bbf ROOT
+
+ $ hg debugobsolete
+ 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3
77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5b5708a437f27665db42c5a261a539a1bcb2a8c2
9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'celeste'}
+ 5ffb9e311b35f6ab6f76f667ca5d6e595645481b
956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ 956063ac4557828781733b2d5677a351ce856f59
3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'celeste'}
+ d33b0a3a64647d79583526be8107802b1f9fedfa
5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'amend', 'user': 'bob'}
+ ef908e42ce65ef57f970d799acaddde26f58a4cc
5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000)
{'operation': 'rebase', 'user': 'bob'}
+
+ $ cd ..
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
