Mercurial > evolve

changeset 2904:4ae89b5834e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: add a new root changeset to all debugconvertbookmark test case We'll make this root changeset public to check the debugconvertbookmark logic in that regards. It is added in its own changeset since it massively impact all output.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Sep 2017 16:51:49 +0200
parents d16781d7a061
children 610d06bcd714
files tests/test-topic-debugcb.t
diffstat 1 files changed, 71 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-topic-debugcb.t	Fri Sep 01 12:02:27 2017 +0200
+++ b/tests/test-topic-debugcb.t	Fri Sep 01 16:51:49 2017 +0200
@@ -17,6 +17,8 @@
 
   $ hg init repo
   $ cd repo
+  $ echo "Hello" > root
+  $ hg commit -Aqm "root"
   $ echo "Hello" > a
   $ hg commit -Aqm "First commit"
   $ echo "Hello" > b
@@ -30,13 +32,15 @@
   $ hg bookmark "secondfix"
 
   $ hg log -G
-  @  [3:b985e4fea4a4] Fixing second
+  @  [4:ec0e17135a94] Fixing second
   |    bookmark: secondfix
-  o  [2:8e79b09248c2] Fixing first
+  o  [3:e05947b88d69] Fixing first
   |
-  | o  [1:50634233706a] Second commit
-  |/     bookmark: hellos
-  o  [0:3caf92e45cfb] First commit
+  | o  [2:f53d1144f925] Second commit
+  | |    bookmark: hellos
+  | o  [1:df1fd5e18154] First commit
+  |/
+  o  [0:249055fcca50] root
   
 
 Generic tests
@@ -70,15 +74,17 @@
 =======================================
 
   $ hg debugconvertbookmark -b hellos
-  changed topic to "hellos" on 1 revisions
+  changed topic to "hellos" on 2 revisions
   $ hg log -G
-  o  [4:ca8825a7eb18] Second commit
+  o  [6:98ae7930f6ed] Second commit
+  |    topic: hellos
+  o  [5:ff69f6ee4618] First commit
   |    topic: hellos
-  | @  [3:b985e4fea4a4] Fixing second
+  | @  [4:ec0e17135a94] Fixing second
   | |    bookmark: secondfix
-  | o  [2:8e79b09248c2] Fixing first
+  | o  [3:e05947b88d69] Fixing first
   |/
-  o  [0:3caf92e45cfb] First commit
+  o  [0:249055fcca50] root
   
 
 Changing all bookmarks to topic
@@ -91,13 +97,15 @@
   switching to topic secondfix
   changed topic to "secondfix" on 2 revisions
   $ hg log -G
-  @  [6:6efc0524f97a] Fixing second
+  @  [8:5f0f9cc1979a] Fixing second
   |    topic: secondfix
-  o  [5:0a4244c62a16] Fixing first
+  o  [7:f8ecbf3b10be] Fixing first
   |    topic: secondfix
-  | o  [4:ca8825a7eb18] Second commit
+  | o  [6:98ae7930f6ed] Second commit
+  | |    topic: hellos
+  | o  [5:ff69f6ee4618] First commit
   |/     topic: hellos
-  o  [0:3caf92e45cfb] First commit
+  o  [0:249055fcca50] root
   
 
 Trying with multiple bookmarks on a single changeset
@@ -108,32 +116,36 @@
   $ hg bookmark book1
   $ hg bookmark book2
   $ hg log -G
-  @  [7:7c46b4bbdda3] Trying multiple bookmarks
+  @  [9:4ad3e7d421d4] Trying multiple bookmarks
   |    bookmark: book1
   |    bookmark:book2
   |    topic: secondfix
-  o  [6:6efc0524f97a] Fixing second
+  o  [8:5f0f9cc1979a] Fixing second
   |    topic: secondfix
-  o  [5:0a4244c62a16] Fixing first
+  o  [7:f8ecbf3b10be] Fixing first
   |    topic: secondfix
-  | o  [4:ca8825a7eb18] Second commit
+  | o  [6:98ae7930f6ed] Second commit
+  | |    topic: hellos
+  | o  [5:ff69f6ee4618] First commit
   |/     topic: hellos
-  o  [0:3caf92e45cfb] First commit
+  o  [0:249055fcca50] root
   
   $ hg debugconvertbookmark --all
-  skipping '7' as it has multiple bookmarks on it
+  skipping '9' as it has multiple bookmarks on it
   $ hg log -G
-  @  [7:7c46b4bbdda3] Trying multiple bookmarks
+  @  [9:4ad3e7d421d4] Trying multiple bookmarks
   |    bookmark: book1
   |    bookmark:book2
   |    topic: secondfix
-  o  [6:6efc0524f97a] Fixing second
+  o  [8:5f0f9cc1979a] Fixing second
   |    topic: secondfix
-  o  [5:0a4244c62a16] Fixing first
+  o  [7:f8ecbf3b10be] Fixing first
   |    topic: secondfix
-  | o  [4:ca8825a7eb18] Second commit
+  | o  [6:98ae7930f6ed] Second commit
+  | |    topic: hellos
+  | o  [5:ff69f6ee4618] First commit
   |/     topic: hellos
-  o  [0:3caf92e45cfb] First commit
+  o  [0:249055fcca50] root
   
 
 Two bookmarks on two different topological branches
@@ -143,6 +155,8 @@
   $ rm -rf repo
   $ hg init setup1
   $ cd setup1
+  $ echo "Hello" > root
+  $ hg commit -Aqm "root"
   $ echo "Hello" > A
   $ hg commit -Aqm "A"
   $ echo "Hello" > B
@@ -161,34 +175,38 @@
   $ hg bookmark -r 'desc(F)' foo
 
   $ hg log -G
-  @  [5:5a63fc519ddc] F
+  @  [6:32f4660df717] F
   |    bookmark: foo
-  o  [4:a9fc8fb0c70c] E
+  o  [5:d4608d9df75e] E
   |
-  | o  [3:e92ae92e366f] D
+  | o  [4:4963af405f62] D
   | |    bookmark: bar
-  | o  [2:9cc6a71c9557] C
+  | o  [3:ac05e0d05d00] C
   |/
-  o  [1:a7922543592c] B
+  o  [2:10f317d09e78] B
   |
-  o  [0:fc58adec4bcd] A
+  o  [1:e34122c9a2bf] A
+  |
+  o  [0:249055fcca50] root
   
   $ hg debugconvertbookmark --all
   changed topic to "bar" on 2 revisions
   switching to topic foo
   changed topic to "foo" on 2 revisions
   $ hg log -G
-  @  [9:994cbef2c2d2] F
+  @  [10:f0b5f2a5f31a] F
   |    topic: foo
-  o  [8:b9d8ef5d5b8a] E
+  o  [9:7affa1350ff0] E
   |    topic: foo
-  | o  [7:e8ba703ef9ab] D
+  | o  [8:a1bb64d88f0e] D
   | |    topic: bar
-  | o  [6:6307829aaf11] C
+  | o  [7:71827f564e9e] C
   |/     topic: bar
-  o  [1:a7922543592c] B
+  o  [2:10f317d09e78] B
   |
-  o  [0:fc58adec4bcd] A
+  o  [1:e34122c9a2bf] A
+  |
+  o  [0:249055fcca50] root
   
 
 Two bookmarks on top of each other
@@ -198,6 +216,8 @@
   $ rm -rf setup1
   $ hg init setup2
   $ cd setup2
+  $ echo "Hello" > root
+  $ hg commit -Aqm "root"
   $ echo "Hello" > A
   $ hg commit -Aqm "A"
   $ hg phase --public .
@@ -213,15 +233,17 @@
   $ hg bookmark -r . foo
 
   $ hg log -G
-  @  [4:ef9d596cf6ea] E
+  @  [5:c633aa1ad270] E
   |    bookmark: foo
-  o  [3:e92ae92e366f] D
+  o  [4:4963af405f62] D
   |
-  o  [2:9cc6a71c9557] C
+  o  [3:ac05e0d05d00] C
   |    bookmark: bar
-  o  [1:a7922543592c] B
+  o  [2:10f317d09e78] B
   |
-  o  [0:fc58adec4bcd] A
+  o  [1:e34122c9a2bf] A
+  |
+  o  [0:249055fcca50] root
   
 
 XXX: this should bot only put topic 'foo' on 3,4 but also 'bar' on 0,1,2
@@ -231,13 +253,15 @@
   changed topic to "foo" on 2 revisions
 
   $ hg log -G
-  @  [6:e2bbb25b8882] E
+  @  [7:b14d13efcfa7] E
   |    topic: foo
-  o  [5:71bced29cbae] D
+  o  [6:c89ca6e70978] D
   |    topic: foo
-  o  [2:9cc6a71c9557] C
+  o  [3:ac05e0d05d00] C
   |    bookmark: bar
-  o  [1:a7922543592c] B
+  o  [2:10f317d09e78] B
   |
-  o  [0:fc58adec4bcd] A
+  o  [1:e34122c9a2bf] A
+  |
+  o  [0:249055fcca50] root