Mercurial > evolve

comparison tests/test-evolve-obshistory-fold.t @ 5123:900668a93629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obslog: use _successorsetverb() in regular obslog too It was already used for obslog --filternonlocal.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 14 Jan 2020 20:20:13 +0700
parents f44cc9abf21c
children ce8479d1a6f9
comparison
equal deleted inserted replaced
5122:e3ab6017a40a 5123:900668a93629
71 71
72 Check that debugobshistory on the first folded revision show only 72 Check that debugobshistory on the first folded revision show only
73 the revision with the target 73 the revision with the target
74 $ hg obslog --hidden 471f378eab4c --patch 74 $ hg obslog --hidden 471f378eab4c --patch
75 x 471f378eab4c (1) A0 75 x 471f378eab4c (1) A0
76 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 76 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
77 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 77 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
78 --- a/changeset-description 78 --- a/changeset-description
79 +++ b/changeset-description 79 +++ b/changeset-description
80 @@ -1,1 +1,1 @@ 80 @@ -1,1 +1,1 @@
81 -A0 81 -A0
91 Check that with all option, all changesets are shown 91 Check that with all option, all changesets are shown
92 $ hg obslog --hidden --all 471f378eab4c --patch 92 $ hg obslog --hidden --all 471f378eab4c --patch
93 @ eb5a0daa2192 (3) C0 93 @ eb5a0daa2192 (3) C0
94 |\ 94 |\
95 x | 0dec01379d3b (2) B0 95 x | 0dec01379d3b (2) B0
96 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 96 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
97 | (No patch available, changesets rebased) 97 | (No patch available, changesets rebased)
98 | 98 |
99 x 471f378eab4c (1) A0 99 x 471f378eab4c (1) A0
100 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 100 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
101 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 101 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
102 --- a/changeset-description 102 --- a/changeset-description
103 +++ b/changeset-description 103 +++ b/changeset-description
104 @@ -1,1 +1,1 @@ 104 @@ -1,1 +1,1 @@
105 -A0 105 -A0
114 114
115 Check that debugobshistory on the second folded revision show only 115 Check that debugobshistory on the second folded revision show only
116 the revision with the target 116 the revision with the target
117 $ hg obslog --hidden 0dec01379d3b --patch 117 $ hg obslog --hidden 0dec01379d3b --patch
118 x 0dec01379d3b (2) B0 118 x 0dec01379d3b (2) B0
119 rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 119 folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
120 (No patch available, changesets rebased) 120 (No patch available, changesets rebased)
121 121
122 Check that with all option, all changesets are shown 122 Check that with all option, all changesets are shown
123 $ hg obslog --hidden --all 0dec01379d3b --patch 123 $ hg obslog --hidden --all 0dec01379d3b --patch
124 @ eb5a0daa2192 (3) C0 124 @ eb5a0daa2192 (3) C0
125 |\ 125 |\
126 x | 0dec01379d3b (2) B0 126 x | 0dec01379d3b (2) B0
127 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 127 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
128 | (No patch available, changesets rebased) 128 | (No patch available, changesets rebased)
129 | 129 |
130 x 471f378eab4c (1) A0 130 x 471f378eab4c (1) A0
131 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 131 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
132 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 132 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
133 --- a/changeset-description 133 --- a/changeset-description
134 +++ b/changeset-description 134 +++ b/changeset-description
135 @@ -1,1 +1,1 @@ 135 @@ -1,1 +1,1 @@
136 -A0 136 -A0
147 graph 147 graph
148 $ hg obslog eb5a0daa2192 --patch 148 $ hg obslog eb5a0daa2192 --patch
149 @ eb5a0daa2192 (3) C0 149 @ eb5a0daa2192 (3) C0
150 |\ 150 |\
151 x | 0dec01379d3b (2) B0 151 x | 0dec01379d3b (2) B0
152 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 152 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
153 | (No patch available, changesets rebased) 153 | (No patch available, changesets rebased)
154 | 154 |
155 x 471f378eab4c (1) A0 155 x 471f378eab4c (1) A0
156 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 156 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
157 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 157 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
158 --- a/changeset-description 158 --- a/changeset-description
159 +++ b/changeset-description 159 +++ b/changeset-description
160 @@ -1,1 +1,1 @@ 160 @@ -1,1 +1,1 @@
161 -A0 161 -A0
189 "operation": "fold", 189 "operation": "fold",
190 "succnodes": [ 190 "succnodes": [
191 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" 191 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
192 ], 192 ],
193 "user": "test", 193 "user": "test",
194 "verb": "rewritten" 194 "verb": "folded"
195 } 195 }
196 ], 196 ],
197 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", 197 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
198 "shortdescription": "A0" 198 "shortdescription": "A0"
199 }, 199 },
212 "operation": "fold", 212 "operation": "fold",
213 "succnodes": [ 213 "succnodes": [
214 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" 214 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
215 ], 215 ],
216 "user": "test", 216 "user": "test",
217 "verb": "rewritten" 217 "verb": "folded"
218 } 218 }
219 ], 219 ],
220 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", 220 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
221 "shortdescription": "B0" 221 "shortdescription": "B0"
222 } 222 }
247 247
248 $ hg obslog -R $TESTTMP/server --patch tip --all 248 $ hg obslog -R $TESTTMP/server --patch tip --all
249 o eb5a0daa2192 (2) C0 249 o eb5a0daa2192 (2) C0
250 |\ 250 |\
251 x | 0dec01379d3b 251 x | 0dec01379d3b
252 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 252 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
253 | (No patch available, context is not local) 253 | (No patch available, context is not local)
254 | 254 |
255 x 471f378eab4c (1) A0 255 x 471f378eab4c (1) A0
256 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 256 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
257 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 257 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
258 --- a/changeset-description 258 --- a/changeset-description
259 +++ b/changeset-description 259 +++ b/changeset-description
260 @@ -1,1 +1,1 @@ 260 @@ -1,1 +1,1 @@
261 -A0 261 -A0
290 290
291 $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden 291 $ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
292 o eb5a0daa2192 (2) C0 292 o eb5a0daa2192 (2) C0
293 |\ 293 |\
294 x | 0dec01379d3b 294 x | 0dec01379d3b
295 / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 295 / folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
296 | (No patch available, context is not local) 296 | (No patch available, context is not local)
297 | 297 |
298 x 471f378eab4c (1) A0 298 x 471f378eab4c (1) A0
299 rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) 299 folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
300 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description 300 diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
301 --- a/changeset-description 301 --- a/changeset-description
302 +++ b/changeset-description 302 +++ b/changeset-description
303 @@ -1,1 +1,1 @@ 303 @@ -1,1 +1,1 @@
304 -A0 304 -A0