Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
head-checking: add test variants with topics stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 06 Apr 2020 02:56:43 +0200
branchstable
changeset 5269 5a46f156c9b7
parent 5268 11c359b4071d
child 5270 c6a84c6a26b8
head-checking: add test variants with topics
tests/test-push-checkheads-multi-topics-F1.t file | annotate | diff | comparison | revisions
tests/test-push-checkheads-multi-topics-F2.t file | annotate | diff | comparison | revisions
tests/test-push-checkheads-multi-topics-F3.t file | annotate | diff | comparison | revisions
tests/testlib/push-checkheads-util.sh file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-multi-topics-F1.t	Mon Apr 06 02:56:43 2020 +0200
@@ -0,0 +1,98 @@
+====================================
+Testing head checking code: Case E-1
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category F: case involving changeset on multiple topic
+TestCase 1: moving a branch to another location
+
+.. old-state:
+..
+.. * 1-changeset on topic Y
+.. * 1-changeset on topic Z (above Y)
+..
+.. new-state:
+..
+.. * 1-changeset on topic Y
+.. * 1-changeset on topic Z (rebased away from A0)
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   B ø⇠◔ B' topic Z
+..     | |
+..   A ◔ |    topic Y
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/topic_setup.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir E1
+  $ cd E1
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg topic -r . Y
+  switching to topic Y
+  changed topic on 1 changesets to "Y"
+  $ hg topic Z
+  $ mkcommit B0
+  active topic 'Z' grew its first changeset
+  (see 'hg help topics' for more information)
+  $ hg push
+  pushing to $TESTTMP/E1/server
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 1 changes to 2 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg up 0
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ hg topic Z
+  marked working directory as topic: Z
+  $ mkcommit B1
+  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  845eeb768064 (draft)[Z]: B1
+  |
+  | x  e1494106e1ca (draft)[Z]: B0
+  | |
+  | o  f5cd873e2965 (draft)[Y]: A0
+  |/
+  | x  8aaa48160adc (draft): A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push
+  pushing to $TESTTMP/E1/server
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-multi-topics-F2.t	Mon Apr 06 02:56:43 2020 +0200
@@ -0,0 +1,112 @@
+====================================
+Testing head checking code: Case E-2
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category F: case involving changeset on multiple branch
+TestCase 2: moving interleaved branch away from each other
+
+.. old-state:
+..
+.. * 2-changeset on topic Y
+.. * 1-changeset on topic Z (between the two other)
+..
+.. new-state:
+..
+.. * 2-changeset on topic Y, aligned
+.. * 1-changeset on topic Z (at the same location)
+..
+.. expected-result:
+..
+.. * push allowed
+..
+.. graph-summary:
+..
+..   C ø⇠◔ C' topic Y
+..     | |
+..   B ◔ |    topic Z
+..     | |
+..   A ø⇠◔ A' topic Y
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/topic_setup.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir E1
+  $ cd E1
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg topic -r . Y
+  switching to topic Y
+  changed topic on 1 changesets to "Y"
+  $ hg strip --config extensions.strip= --hidden 'hidden()' # clean old A0
+  saved backup bundle to $TESTTMP/E1/client/.hg/strip-backup/8aaa48160adc-19166392-backup.hg
+  $ hg topic Z
+  $ mkcommit B0
+  active topic 'Z' grew its first changeset
+  (see 'hg help topics' for more information)
+  $ hg topic Y
+  $ mkcommit C0
+  $ hg push
+  pushing to $TESTTMP/E1/server
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 3 changesets with 2 changes to 3 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg up 0
+  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
+  $ hg topic Y
+  marked working directory as topic: Y
+  $ mkcommit A1
+  $ mkcommit C1
+  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  2 new orphan changesets
+  $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  0e26ba57d799 (draft)[Y]: C1
+  |
+  o  fb4a34222909 (draft)[Y]: A1
+  |
+  | x  345721b128e8 (draft)[Y]: C0
+  | |
+  | *  e1494106e1ca (draft)[Z]: B0
+  | |
+  | x  f5cd873e2965 (draft)[Y]: A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push -r 'desc("C1")'
+  pushing to $TESTTMP/E1/server
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  2 new obsolescence markers
+  obsoleted 2 changesets
+  1 new orphan changesets
+
+  $ cd ../..
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-push-checkheads-multi-topics-F3.t	Mon Apr 06 02:56:43 2020 +0200
@@ -0,0 +1,101 @@
+====================================
+Testing head checking code: Case E-3
+====================================
+
+Mercurial checks for the introduction of new heads on push. Evolution comes
+into play to detect if existing branches on the server are being replaced by
+some of the new one we push.
+
+This case is part of a series of tests checking this behavior.
+
+Category E: case involving changeset on multiple branch
+TestCase 8: moving only part of the interleaved branch away, creating 2 heads
+
+.. old-state:
+..
+.. * 2-changeset on topic Y
+.. * 1-changeset on topic Z (between the two other)
+..
+.. new-state:
+..
+.. * 2-changeset on topic Y, on untouched, the other moved
+.. * 1-changeset on topic Z (at the same location)
+..
+.. expected-result:
+..
+.. * push rejected
+..
+.. graph-summary:
+..
+..   C ø⇠◔ C' topic Y
+..     | |
+..   B ◔ |    topic Z
+..     | |
+..   A ◔ |    topic Y
+..     |/
+..     ●
+
+  $ . $TESTDIR/testlib/topic_setup.sh
+  $ . $TESTDIR/testlib/push-checkheads-util.sh
+
+Test setup
+----------
+
+  $ mkdir E1
+  $ cd E1
+  $ setuprepos
+  creating basic server and client repo
+  updating to branch default
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd client
+  $ hg topic -r . Y
+  switching to topic Y
+  changed topic on 1 changesets to "Y"
+  $ hg strip --config extensions.strip= --hidden 'hidden()' # clean old A0
+  saved backup bundle to $TESTTMP/E1/client/.hg/strip-backup/8aaa48160adc-19166392-backup.hg
+  $ hg topic Z
+  $ mkcommit B0
+  active topic 'Z' grew its first changeset
+  (see 'hg help topics' for more information)
+  $ hg topic Y
+  $ mkcommit C0
+  $ hg push
+  pushing to $TESTTMP/E1/server
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 3 changesets with 2 changes to 3 files (+1 heads)
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg up 0
+  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
+  $ hg topic Y
+  marked working directory as topic: Y
+  $ mkcommit C1
+  $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"`
+  1 new obsolescence markers
+  obsoleted 1 changesets
+  $ hg log -G --hidden
+  @  57530ca5eb24 (draft)[Y]: C1
+  |
+  | x  345721b128e8 (draft)[Y]: C0
+  | |
+  | o  e1494106e1ca (draft)[Z]: B0
+  | |
+  | o  f5cd873e2965 (draft)[Y]: A0
+  |/
+  o  1e4be0697311 (public): root
+  
+
+Actual testing
+--------------
+
+  $ hg push -r 'desc("C1")'
+  pushing to $TESTTMP/E1/server
+  searching for changes
+  abort: push creates new remote head 57530ca5eb24 on branch 'default:Y'!
+  (merge or see 'hg help push' for details about pushing new heads)
+  [255]
+
+  $ cd ../..
--- a/tests/testlib/push-checkheads-util.sh	Mon Apr 06 02:17:43 2020 +0200
+++ b/tests/testlib/push-checkheads-util.sh	Mon Apr 06 02:56:43 2020 +0200
@@ -5,7 +5,7 @@
 cat >> $HGRCPATH <<EOF
 [ui]
 # simpler log output
-logtemplate ="{node|short} ({phase}): {desc}\n"
+logtemplate ="{node|short} ({phase}){if(topic, "[{topic}]")}: {desc}\n"
 
 [phases]
 # non publishing server
evolve