annotate tests/test-topic-debugcb.t @ 3454:56277182c029

obslog: drop period from summary line in accordance with convention
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 25 Jan 2018 17:29:21 -0800
parents 2e703ed1c713
children d5adce52cef4 8bffab1e7c4f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
1 ==================================================
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
2 Test for `hg debugconvertbookmark` added by topics
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
3 ==================================================
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
4
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
5 $ . "$TESTDIR/testlib/topic_setup.sh"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
6
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
7 $ cat << EOF >> $HGRCPATH
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
8 > drawdag=$RUNTESTDIR/drawdag.py
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
9 > [ui]
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
10 > logtemplate = [{rev}:{node|short}] {desc|firstline}\n\
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
11 > {if(bookmarks, " bookmark: {join(bookmarks,"\n bookmark:")}\n")}\
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
12 > {if(topics, " topic: {topics}\n")}
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
13 > EOF
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
14
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
15 Setting up the things
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
16 ---------------------
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
17
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
18 $ hg init repo
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
19 $ cd repo
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
20 $ echo "Hello" > root
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
21 $ hg commit -Aqm "root"
2905
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
22 $ hg phase --public .
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
23 $ echo "Hello" > a
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
24 $ hg commit -Aqm "First commit"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
25 $ echo "Hello" > b
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
26 $ hg commit -Aqm "Second commit"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
27 $ hg bookmark "hellos"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
28 $ hg up 0 -q
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
29 $ echo "Fix 1" > l
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
30 $ hg commit -Aqm "Fixing first"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
31 $ echo "Fix 2" > m
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
32 $ hg commit -Aqm "Fixing second"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
33 $ hg bookmark "secondfix"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
34
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
35 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
36 @ [4:ec0e17135a94] Fixing second
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
37 | bookmark: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
38 o [3:e05947b88d69] Fixing first
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
39 |
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
40 | o [2:f53d1144f925] Second commit
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
41 | | bookmark: hellos
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
42 | o [1:df1fd5e18154] First commit
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
43 |/
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
44 o [0:249055fcca50] root
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
45
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
46
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
47 Generic tests
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
48 =============
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
49
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
50 Help for the command
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
51 --------------------
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
52
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
53 $ hg help debugconvertbookmark
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
54 hg debugcb [-b BOOKMARK] [--all]
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
55
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
56 aliases: debugconvertbookmark
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
57
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
58 Converts a bookmark to a topic with the same name.
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
59
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
60 options:
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
61
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
62 -b --bookmark VALUE bookmark to convert to topic
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
63 --all convert all bookmarks to topics
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
64
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
65 (some details hidden, use --verbose to show complete help)
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
66
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
67 Running without any argument
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
68 ----------------------------
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
69
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
70 $ hg debugconvertbookmark
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
71 abort: you must specify either '--all' or '-b'
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
72 [255]
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
73
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
74 Changing a particular bookmark to topic
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
75 =======================================
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
76
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
77 $ hg debugconvertbookmark -b hellos
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
78 changed topic to "hellos" on 2 revisions
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
79 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
80 o [6:98ae7930f6ed] Second commit
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
81 | topic: hellos
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
82 o [5:ff69f6ee4618] First commit
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
83 | topic: hellos
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
84 | @ [4:ec0e17135a94] Fixing second
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
85 | | bookmark: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
86 | o [3:e05947b88d69] Fixing first
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
87 |/
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
88 o [0:249055fcca50] root
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
89
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
90
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
91 Changing all bookmarks to topic
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
92 ===============================
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
93
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
94 Simple test
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
95 -----------
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
96
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
97 $ hg debugconvertbookmark --all
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
98 switching to topic secondfix
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
99 changed topic to "secondfix" on 2 revisions
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
100 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
101 @ [8:5f0f9cc1979a] Fixing second
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
102 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
103 o [7:f8ecbf3b10be] Fixing first
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
104 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
105 | o [6:98ae7930f6ed] Second commit
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
106 | | topic: hellos
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
107 | o [5:ff69f6ee4618] First commit
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
108 |/ topic: hellos
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
109 o [0:249055fcca50] root
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
110
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
111
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
112 Trying with multiple bookmarks on a single changeset
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
113 ----------------------------------------------------
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
114
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
115 $ echo "multiple bookmarks" >> m
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
116 $ hg commit -Aqm "Trying multiple bookmarks"
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
117 $ hg bookmark book1
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
118 $ hg bookmark book2
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
119 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
120 @ [9:4ad3e7d421d4] Trying multiple bookmarks
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
121 | bookmark: book1
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
122 | bookmark:book2
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
123 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
124 o [8:5f0f9cc1979a] Fixing second
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
125 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
126 o [7:f8ecbf3b10be] Fixing first
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
127 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
128 | o [6:98ae7930f6ed] Second commit
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
129 | | topic: hellos
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
130 | o [5:ff69f6ee4618] First commit
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
131 |/ topic: hellos
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
132 o [0:249055fcca50] root
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
133
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
134 $ hg debugconvertbookmark --all
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
135 skipping '9' as it has multiple bookmarks on it
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
136 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
137 @ [9:4ad3e7d421d4] Trying multiple bookmarks
2900
1928e9c802dd convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2899
diff changeset
138 | bookmark: book1
1928e9c802dd convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2899
diff changeset
139 | bookmark:book2
1928e9c802dd convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2899
diff changeset
140 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
141 o [8:5f0f9cc1979a] Fixing second
2900
1928e9c802dd convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2899
diff changeset
142 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
143 o [7:f8ecbf3b10be] Fixing first
2900
1928e9c802dd convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2899
diff changeset
144 | topic: secondfix
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
145 | o [6:98ae7930f6ed] Second commit
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
146 | | topic: hellos
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
147 | o [5:ff69f6ee4618] First commit
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
148 |/ topic: hellos
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
149 o [0:249055fcca50] root
2899
32306ee32806 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff changeset
150
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
151
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
152 Two bookmarks on two different topological branches
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
153 ---------------------------------------------------
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
154
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
155 $ cd ..
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
156 $ rm -rf repo
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
157 $ hg init setup1
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
158 $ cd setup1
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
159 $ echo "Hello" > root
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
160 $ hg commit -Aqm "root"
2905
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
161 $ hg phase --public .
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
162 $ echo "Hello" > A
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
163 $ hg commit -Aqm "A"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
164 $ echo "Hello" > B
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
165 $ hg commit -Aqm "B"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
166 $ echo "Hello" > C
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
167 $ hg commit -Aqm "C"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
168 $ echo "Hello" > D
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
169 $ hg commit -Aqm "D"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
170 $ hg up 'desc(B)'
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
171 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
172 $ echo "Hello" > E
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
173 $ hg commit -Aqm "E"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
174 $ echo "Hello" > F
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
175 $ hg commit -Aqm "F"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
176 $ hg bookmark -r 'desc(D)' bar
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
177 $ hg bookmark -r 'desc(F)' foo
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
178
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
179 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
180 @ [6:32f4660df717] F
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
181 | bookmark: foo
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
182 o [5:d4608d9df75e] E
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
183 |
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
184 | o [4:4963af405f62] D
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
185 | | bookmark: bar
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
186 | o [3:ac05e0d05d00] C
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
187 |/
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
188 o [2:10f317d09e78] B
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
189 |
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
190 o [1:e34122c9a2bf] A
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
191 |
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
192 o [0:249055fcca50] root
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
193
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
194 $ hg debugconvertbookmark --all
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
195 changed topic to "bar" on 2 revisions
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
196 switching to topic foo
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
197 changed topic to "foo" on 2 revisions
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
198 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
199 @ [10:f0b5f2a5f31a] F
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
200 | topic: foo
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
201 o [9:7affa1350ff0] E
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
202 | topic: foo
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
203 | o [8:a1bb64d88f0e] D
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
204 | | topic: bar
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
205 | o [7:71827f564e9e] C
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
206 |/ topic: bar
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
207 o [2:10f317d09e78] B
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
208 |
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
209 o [1:e34122c9a2bf] A
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
210 |
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
211 o [0:249055fcca50] root
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
212
2903
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
213
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
214 Two bookmarks on top of each other
d16781d7a061 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2902
diff changeset
215 ----------------------------------
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
216
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
217 $ cd ..
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
218 $ rm -rf setup1
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
219 $ hg init setup2
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
220 $ cd setup2
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
221 $ echo "Hello" > root
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
222 $ hg commit -Aqm "root"
2905
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
223 $ hg phase --public .
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
224 $ echo "Hello" > A
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
225 $ hg commit -Aqm "A"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
226 $ hg phase --public .
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
227 $ echo "Hello" > B
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
228 $ hg commit -Aqm "B"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
229 $ echo "Hello" > C
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
230 $ hg commit -Aqm "C"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
231 $ hg bookmark -r . bar
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
232 $ echo "Hello" > D
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
233 $ hg commit -Aqm "D"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
234 $ echo "Hello" > E
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
235 $ hg commit -Aqm "E"
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
236 $ hg bookmark -r . foo
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
237
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
238 $ hg log -G
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
239 @ [5:c633aa1ad270] E
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
240 | bookmark: foo
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
241 o [4:4963af405f62] D
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
242 |
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
243 o [3:ac05e0d05d00] C
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
244 | bookmark: bar
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
245 o [2:10f317d09e78] B
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
246 |
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
247 o [1:e34122c9a2bf] A
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
248 |
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
249 o [0:249055fcca50] root
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
250
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
251
2909
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
252 XXX: this should avoid create orphan changesets.
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
253
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
254 $ hg debugconvertbookmark --all
2909
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
255 changed topic to "bar" on 2 revisions
2902
f6e297fda5c6 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2901
diff changeset
256 switching to topic foo
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
257 changed topic to "foo" on 2 revisions
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
258 2 new orphan changesets
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
259
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
260 $ hg log -G
2909
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
261 @ [9:b14d13efcfa7] E
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
262 | topic: foo
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3411
diff changeset
263 * [8:c89ca6e70978] D
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
264 | topic: foo
2909
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
265 | o [7:a3ea0dfe6a10] C
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
266 | | topic: bar
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
267 | o [6:db1bc6aab480] B
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
268 | | topic: bar
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
269 x | [3:ac05e0d05d00] C
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
270 | |
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
271 x | [2:10f317d09e78] B
9ce092b17530 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2905
diff changeset
272 |/
2904
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
273 o [1:e34122c9a2bf] A
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
274 |
4ae89b5834e6 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2903
diff changeset
275 o [0:249055fcca50] root
2901
52e6b28704a7 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents: 2900
diff changeset
276
2905
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
277
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
278 Check that phase are properly take in account
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
279 ---------------------------------------------
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
280
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
281 (we reuse above test, taking advantage of a small bug regarding stacked bookmarks. we can fuse the two tests once that bug is fixed)
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
282
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
283 $ cd ..
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
284 $ hg init setup-phases
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
285 $ cd setup-phases
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
286 $ echo "Hello" > root
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
287 $ hg commit -Aqm "root"
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
288 $ hg phase --public .
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
289 $ echo "Hello" > A
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
290 $ hg commit -Aqm "A"
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
291 $ echo "Hello" > B
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
292 $ hg commit -Aqm "B"
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
293 $ echo "Hello" > C
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
294 $ hg commit -Aqm "C"
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
295 $ hg bookmark -r . bar
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
296 $ hg log -G
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
297 @ [3:ac05e0d05d00] C
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
298 | bookmark: bar
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
299 o [2:10f317d09e78] B
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
300 |
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
301 o [1:e34122c9a2bf] A
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
302 |
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
303 o [0:249055fcca50] root
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
304
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
305
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
306 $ hg debugconvertbookmark --all
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
307 switching to topic bar
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
308 changed topic to "bar" on 3 revisions
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
309 $ hg log -G
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
310 @ [6:863c43a7951c] C
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
311 | topic: bar
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
312 o [5:ac7f12ac947f] B
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
313 | topic: bar
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
314 o [4:fc82c8c14b4c] A
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
315 | topic: bar
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
316 o [0:249055fcca50] root
610d06bcd714 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2904
diff changeset
317