Mercurial > evolve

comparison tests/test-obsolete.t @ 49:4e804af47e57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change test output again (get a better distinction between rev number and hash to detect hidden changeset)
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 08 Sep 2011 16:54:01 +0200
parents 3b0364fc822f
children 19b22ad56b32
comparison
equal deleted inserted replaced
48:5fd7b64aa8c5 49:4e804af47e57
9 > echo "$1" > "$1" 9 > echo "$1" > "$1"
10 > hg add "$1" 10 > hg add "$1"
11 > hg ci -m "add $1" 11 > hg ci -m "add $1"
12 > } 12 > }
13 13
14 $ alias qlog="hg log --template='{rev} {node|short}\n'" 14 $ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
15 $ hg init local 15 $ hg init local
16 $ cd local 16 $ cd local
17 $ mkcommit a # 0 17 $ mkcommit a # 0
18 $ mkcommit b # 1 18 $ mkcommit b # 1
19 $ mkcommit c # 2 19 $ mkcommit c # 2
25 25
26 26
27 Test that obsolete changeset are hidden 27 Test that obsolete changeset are hidden
28 28
29 $ qlog 29 $ qlog
30 3 0d3f46688ccc 30 3
31 1 7c3bad9141dc 31 - 0d3f46688ccc
32 0 1f0dee641bb7 32 1
33 - 7c3bad9141dc
34 0
35 - 1f0dee641bb7
33 $ qlog --hidden 36 $ qlog --hidden
34 3 0d3f46688ccc 37 3
35 2 4538525df7e2 38 - 0d3f46688ccc
36 1 7c3bad9141dc 39 2
37 0 1f0dee641bb7 40 - 4538525df7e2
41 1
42 - 7c3bad9141dc
43 0
44 - 1f0dee641bb7
38 $ qlog -r 'obsolete()' --hidden 45 $ qlog -r 'obsolete()' --hidden
39 2 4538525df7e2 46 2
47 - 4538525df7e2
40 48
41 test obsolete changeset with no-obsolete descendant 49 test obsolete changeset with no-obsolete descendant
42 $ hg up 1 -q 50 $ hg up 1 -q
43 $ mkcommit "obsol_c'" # 4 (on 1) 51 $ mkcommit "obsol_c'" # 4 (on 1)
44 created new head 52 created new head
45 $ hg debugobsolete 4 3 53 $ hg debugobsolete 4 3
46 $ qlog 54 $ qlog
47 4 725c380fe99b 55 4
48 1 7c3bad9141dc 56 - 725c380fe99b
49 0 1f0dee641bb7 57 1
58 - 7c3bad9141dc
59 0
60 - 1f0dee641bb7
50 $ qlog -r 'obsolete()' --hidden 61 $ qlog -r 'obsolete()' --hidden
51 2 4538525df7e2 62 2
52 3 0d3f46688ccc 63 - 4538525df7e2
64 3
65 - 0d3f46688ccc
53 $ hg up 3 -q 66 $ hg up 3 -q
54 $ mkcommit d # 5 (on 3) 67 $ mkcommit d # 5 (on 3)
55 $ qlog -r 'obsolete()' 68 $ qlog -r 'obsolete()'
56 3 0d3f46688ccc 69 3
70 - 0d3f46688ccc
57 71
58 Test communication of obsolete relation with a compatible client 72 Test communication of obsolete relation with a compatible client
59 73
60 $ hg init ../other-new 74 $ hg init ../other-new
61 $ hg push --traceback ../other-new 75 $ hg push --traceback ../other-new
64 adding changesets 78 adding changesets
65 adding manifests 79 adding manifests
66 adding file changes 80 adding file changes
67 added 5 changesets with 5 changes to 5 files (+1 heads) 81 added 5 changesets with 5 changes to 5 files (+1 heads)
68 $ qlog -R ../other-new -r 'obsolete()' 82 $ qlog -R ../other-new -r 'obsolete()'
69 2 0d3f46688ccc 83 2
84 - 0d3f46688ccc
70 $ qlog -R ../other-new 85 $ qlog -R ../other-new
71 4 a7a6f2b5d8a5 86 4
72 3 725c380fe99b 87 - a7a6f2b5d8a5
73 2 0d3f46688ccc 88 3
74 1 7c3bad9141dc 89 - 725c380fe99b
75 0 1f0dee641bb7 90 2
91 - 0d3f46688ccc
92 1
93 - 7c3bad9141dc
94 0
95 - 1f0dee641bb7
76 $ hg up 3 -q 96 $ hg up 3 -q
77 $ mkcommit obsol_d # 6 97 $ mkcommit obsol_d # 6
78 created new head 98 created new head
79 $ hg debugobsolete 6 5 99 $ hg debugobsolete 6 5
80 $ qlog 100 $ qlog
81 6 95de7fc6918d 101 6
82 4 725c380fe99b 102 - 95de7fc6918d
83 3 0d3f46688ccc 103 4
84 1 7c3bad9141dc 104 - 725c380fe99b
85 0 1f0dee641bb7 105 3
106 - 0d3f46688ccc
107 1
108 - 7c3bad9141dc
109 0
110 - 1f0dee641bb7
86 $ qlog -r 'obsolete()' 111 $ qlog -r 'obsolete()'
87 3 0d3f46688ccc 112 3
113 - 0d3f46688ccc
88 $ hg push ../other-new -f # XXX should not have to use -f 114 $ hg push ../other-new -f # XXX should not have to use -f
89 pushing to ../other-new 115 pushing to ../other-new
90 searching for changes 116 searching for changes
91 adding changesets 117 adding changesets
92 adding manifests 118 adding manifests
93 adding file changes 119 adding file changes
94 added 1 changesets with 1 changes to 1 files (+1 heads) 120 added 1 changesets with 1 changes to 1 files (+1 heads)
95 $ qlog -R ../other-new 121 $ qlog -R ../other-new
96 5 95de7fc6918d 122 5
97 3 725c380fe99b 123 - 95de7fc6918d
98 2 0d3f46688ccc 124 3
99 1 7c3bad9141dc 125 - 725c380fe99b
100 0 1f0dee641bb7 126 2
127 - 0d3f46688ccc
128 1
129 - 7c3bad9141dc
130 0
131 - 1f0dee641bb7
101 $ qlog -R ../other-new -r 'obsolete()' 132 $ qlog -R ../other-new -r 'obsolete()'
102 2 0d3f46688ccc 133 2
134 - 0d3f46688ccc
103 $ hg up -q .^ 135 $ hg up -q .^
104 $ mkcommit "obsol_d'" # 7 136 $ mkcommit "obsol_d'" # 7
105 created new head 137 created new head
106 $ hg debugobsolete 7 6 138 $ hg debugobsolete 7 6
107 $ hg pull -R ../other-new . 139 $ hg pull -R ../other-new .
111 adding manifests 143 adding manifests
112 adding file changes 144 adding file changes
113 added 2 changesets with 2 changes to 2 files (+2 heads) 145 added 2 changesets with 2 changes to 2 files (+2 heads)
114 (run 'hg heads .' to see heads, 'hg merge' to merge) 146 (run 'hg heads .' to see heads, 'hg merge' to merge)
115 $ qlog -R ../other-new 147 $ qlog -R ../other-new
116 7 909a0fb57e5d 148 7
117 3 725c380fe99b 149 - 909a0fb57e5d
118 2 0d3f46688ccc 150 3
119 1 7c3bad9141dc 151 - 725c380fe99b
120 0 1f0dee641bb7 152 2
153 - 0d3f46688ccc
154 1
155 - 7c3bad9141dc
156 0
157 - 1f0dee641bb7
121 158
122 pushing to stuff that doesn't support obsolete 159 pushing to stuff that doesn't support obsolete
123 160
124 $ hg init ../other-old 161 $ hg init ../other-old
125 $ echo '[extensions]' > ../other-old/.hg/hgrc 162 $ echo '[extensions]' > ../other-old/.hg/hgrc
130 adding changesets 167 adding changesets
131 adding manifests 168 adding manifests
132 adding file changes 169 adding file changes
133 added 5 changesets with 5 changes to 5 files (+1 heads) 170 added 5 changesets with 5 changes to 5 files (+1 heads)
134 $ qlog -R ../other-old 171 $ qlog -R ../other-old
135 4 909a0fb57e5d 172 4
136 3 725c380fe99b 173 - 909a0fb57e5d
137 2 0d3f46688ccc 174 3
138 1 7c3bad9141dc 175 - 725c380fe99b
139 0 1f0dee641bb7 176 2
177 - 0d3f46688ccc
178 1
179 - 7c3bad9141dc
180 0
181 - 1f0dee641bb7
140 182
141 183
142 184