Mercurial > evolve
annotate tests/test-topic-debugcb.t @ 6931:237f99ee3d64 stable
tests: remove leading spaces in `hg help` output, run only on Mercurial 6.9+
Core decided to remove a lot of leading spaces in docstrings to support Python
3.13, see 51057ab0dffa for details.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 11 Nov 2024 10:39:57 +0400 |
parents | 5062ace47b9e |
children |
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 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
8 > [ui] |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
9 > 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
|
10 > {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
|
11 > {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
|
12 > EOF |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
13 |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
14 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
|
15 --------------------- |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
16 |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
17 $ hg init repo |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
18 $ 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
|
19 $ 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
|
20 $ hg commit -Aqm "root" |
2905
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
21 $ hg phase --public . |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
22 $ echo "Hello" > a |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
23 $ 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
|
24 $ echo "Hello" > b |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
25 $ 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
|
26 $ hg bookmark "hellos" |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
27 $ hg up 0 -q |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
28 $ echo "Fix 1" > l |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
29 $ 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
|
30 $ echo "Fix 2" > m |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
31 $ 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
|
32 $ hg bookmark "secondfix" |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
33 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
34 $ 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
|
35 @ [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
|
36 | 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
|
37 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
|
38 | |
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
|
39 | 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
|
40 | | 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
|
41 | 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
|
42 |/ |
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 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
|
44 |
2903
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
45 |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
46 Generic tests |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
47 ============= |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
48 |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
49 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
|
50 -------------------- |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
51 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
52 $ hg help debugconvertbookmark |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
53 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
|
54 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
55 aliases: debugconvertbookmark |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
56 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
57 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
|
58 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
59 options: |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
60 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
61 -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
|
62 --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
|
63 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
64 (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
|
65 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
66 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
|
67 ---------------------------- |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
68 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
69 $ hg debugconvertbookmark |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
70 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
|
71 [255] |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
72 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
73 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
|
74 ======================================= |
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 $ 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
|
77 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
|
78 $ 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
|
79 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
|
80 | 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
|
81 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
|
82 | 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
|
83 | @ [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
|
84 | | 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
|
85 | 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
|
86 |/ |
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
|
87 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
|
88 |
2903
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
89 |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
90 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
|
91 =============================== |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
92 |
2903
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
93 Simple test |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
94 ----------- |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
95 |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
96 $ hg debugconvertbookmark --all |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
97 switching to topic secondfix |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
98 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
|
99 $ 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
|
100 @ [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
|
101 | 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
|
102 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
|
103 | 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
|
104 | 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
|
105 | | 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
|
106 | 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
|
107 |/ 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
|
108 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
|
109 |
2903
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
110 |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
111 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
|
112 ---------------------------------------------------- |
2899
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
113 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
114 $ echo "multiple bookmarks" >> m |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
115 $ 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
|
116 $ hg bookmark book1 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
117 $ hg bookmark book2 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
118 $ 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
|
119 @ [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
|
120 | bookmark: book1 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
121 | bookmark:book2 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
122 | 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
|
123 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
|
124 | 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
|
125 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
|
126 | 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
|
127 | 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
|
128 | | 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
|
129 | 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
|
130 |/ 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
|
131 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
|
132 |
32306ee32806
topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com>
parents:
diff
changeset
|
133 $ hg debugconvertbookmark --all |
5922
8bffab1e7c4f
topic: make two almost identical messages actually identical
Anton Shestakov <av6@dwimlabs.net>
parents:
3431
diff
changeset
|
134 skipping revision 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
|
135 $ 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
|
136 @ [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
|
137 | bookmark: book1 |
1928e9c802dd
convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2899
diff
changeset
|
138 | bookmark:book2 |
1928e9c802dd
convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2899
diff
changeset
|
139 | 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
|
140 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
|
141 | 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
|
142 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
|
143 | 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
|
144 | 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
|
145 | | 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
|
146 | 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
|
147 |/ 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
|
148 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
|
149 |
2903
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
150 |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
151 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
|
152 --------------------------------------------------- |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
153 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
154 $ cd .. |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
155 $ rm -rf repo |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
156 $ hg init setup1 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
157 $ 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
|
158 $ 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
|
159 $ hg commit -Aqm "root" |
2905
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
160 $ 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
|
161 $ 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
|
162 $ 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
|
163 $ 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
|
164 $ 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
|
165 $ 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
|
166 $ 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
|
167 $ 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
|
168 $ 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
|
169 $ 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
|
170 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
|
171 $ 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
|
172 $ 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
|
173 $ 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
|
174 $ 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
|
175 $ 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
|
176 $ hg bookmark -r 'desc(F)' foo |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
177 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
178 $ 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
|
179 @ [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
|
180 | 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
|
181 o [5:d4608d9df75e] E |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
182 | |
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
|
183 | 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
|
184 | | 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
|
185 | o [3:ac05e0d05d00] C |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
186 |/ |
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
|
187 o [2:10f317d09e78] B |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
188 | |
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
|
189 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
|
190 | |
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 o [0:249055fcca50] root |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
192 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
193 $ hg debugconvertbookmark --all |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
194 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
|
195 switching to topic foo |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
196 changed topic to "foo" on 2 revisions |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
197 $ 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
|
198 @ [10:f0b5f2a5f31a] F |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
199 | 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
|
200 o [9:7affa1350ff0] E |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
201 | 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
|
202 | o [8:a1bb64d88f0e] D |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
203 | | 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
|
204 | o [7:71827f564e9e] C |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
205 |/ 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
|
206 o [2:10f317d09e78] B |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
207 | |
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
|
208 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
|
209 | |
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 o [0:249055fcca50] root |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
211 |
2903
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
212 |
d16781d7a061
tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2902
diff
changeset
|
213 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
|
214 ---------------------------------- |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
215 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
216 $ cd .. |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
217 $ rm -rf setup1 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
218 $ hg init setup2 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
219 $ 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
|
220 $ 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
|
221 $ hg commit -Aqm "root" |
2905
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
222 $ 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
|
223 $ 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
|
224 $ 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
|
225 $ 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
|
226 $ 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
|
227 $ 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
|
228 $ 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
|
229 $ 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
|
230 $ 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
|
231 $ 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
|
232 $ 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
|
233 $ 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
|
234 $ 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
|
235 $ hg bookmark -r . foo |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
236 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
237 $ 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
|
238 @ [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
|
239 | 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
|
240 o [4:4963af405f62] D |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
241 | |
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
|
242 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
|
243 | 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
|
244 o [2:10f317d09e78] B |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
245 | |
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
|
246 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
|
247 | |
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 o [0:249055fcca50] root |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
249 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
250 |
2909
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
251 XXX: this should avoid create orphan changesets. |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
252 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
253 $ hg debugconvertbookmark --all |
2909
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
254 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
|
255 switching to topic foo |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
256 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
|
257 2 new orphan changesets |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
258 |
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
259 $ hg log -G |
2909
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
260 @ [9:b14d13efcfa7] E |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
261 | topic: foo |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3411
diff
changeset
|
262 * [8:c89ca6e70978] D |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
263 | topic: foo |
2909
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
264 | o [7:a3ea0dfe6a10] C |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
265 | | topic: bar |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
266 | o [6:db1bc6aab480] B |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
267 | | topic: bar |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
268 x | [3:ac05e0d05d00] C |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
269 | | |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
270 x | [2:10f317d09e78] B |
9ce092b17530
convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2905
diff
changeset
|
271 |/ |
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
|
272 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
|
273 | |
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 o [0:249055fcca50] root |
2901
52e6b28704a7
tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2900
diff
changeset
|
275 |
2905
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
276 |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
277 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
|
278 --------------------------------------------- |
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 (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
|
281 |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
282 $ cd .. |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
283 $ hg init setup-phases |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
284 $ cd setup-phases |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
285 $ echo "Hello" > root |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
286 $ hg commit -Aqm "root" |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
287 $ hg phase --public . |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
288 $ echo "Hello" > A |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
289 $ hg commit -Aqm "A" |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
290 $ echo "Hello" > B |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
291 $ hg commit -Aqm "B" |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
292 $ echo "Hello" > C |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
293 $ hg commit -Aqm "C" |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
294 $ hg bookmark -r . bar |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
295 $ hg log -G |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
296 @ [3:ac05e0d05d00] C |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
297 | bookmark: bar |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
298 o [2:10f317d09e78] B |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
299 | |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
300 o [1:e34122c9a2bf] A |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
301 | |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
302 o [0:249055fcca50] root |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
303 |
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 $ hg debugconvertbookmark --all |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
306 switching to topic bar |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
307 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
|
308 $ hg log -G |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
309 @ [6:863c43a7951c] C |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
310 | topic: bar |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
311 o [5:ac7f12ac947f] B |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
312 | topic: bar |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
313 o [4:fc82c8c14b4c] A |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
314 | topic: bar |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
315 o [0:249055fcca50] root |
610d06bcd714
convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2904
diff
changeset
|
316 |