##// END OF EJS Templates
obsolete: add revset and test for divergent changesets...
Pierre-Yves David -
r18071:bea75471 default
parent child Browse files
Show More
@@ -646,6 +646,15 b' def destination(repo, subset, x):'
646
646
647 return [r for r in subset if r in dests]
647 return [r for r in subset if r in dests]
648
648
649 def divergent(repo, subset, x):
650 """``divergent()``
651 Final successors of changesets with an alternative set of final successors.
652 """
653 # i18n: "divergent" is a keyword
654 getargs(x, 0, 0, _("divergent takes no arguments"))
655 divergent = obsmod.getrevs(repo, 'divergent')
656 return [r for r in subset if r in divergent]
657
649 def draft(repo, subset, x):
658 def draft(repo, subset, x):
650 """``draft()``
659 """``draft()``
651 Changeset in draft phase."""
660 Changeset in draft phase."""
@@ -1541,6 +1550,7 b' symbols = {'
1541 "descendants": descendants,
1550 "descendants": descendants,
1542 "_firstdescendants": _firstdescendants,
1551 "_firstdescendants": _firstdescendants,
1543 "destination": destination,
1552 "destination": destination,
1553 "divergent": divergent,
1544 "draft": draft,
1554 "draft": draft,
1545 "extinct": extinct,
1555 "extinct": extinct,
1546 "extra": extra,
1556 "extra": extra,
@@ -81,6 +81,9 b' A_1 have two direct and divergent succes'
81 82623d38b9ba
81 82623d38b9ba
82 392fd25390da
82 392fd25390da
83 392fd25390da
83 392fd25390da
84 $ hg log -r 'divergent()'
85 2:82623d38b9ba A_1
86 3:392fd25390da A_2
84 $ cd ..
87 $ cd ..
85
88
86
89
@@ -116,6 +119,9 b' indirect divergence with known changeset'
116 01f36c5a8fda
119 01f36c5a8fda
117 01f36c5a8fda
120 01f36c5a8fda
118 01f36c5a8fda
121 01f36c5a8fda
122 $ hg log -r 'divergent()'
123 2:82623d38b9ba A_1
124 4:01f36c5a8fda A_3
119 $ cd ..
125 $ cd ..
120
126
121
127
@@ -145,6 +151,9 b' indirect divergence with known changeset'
145 82623d38b9ba
151 82623d38b9ba
146 392fd25390da
152 392fd25390da
147 392fd25390da
153 392fd25390da
154 $ hg log -r 'divergent()'
155 2:82623d38b9ba A_1
156 3:392fd25390da A_2
148 $ cd ..
157 $ cd ..
149
158
150 do not take unknown node in account if they are final
159 do not take unknown node in account if they are final
@@ -195,6 +204,7 b' divergence that converge again is not di'
195 01f36c5a8fda
204 01f36c5a8fda
196 01f36c5a8fda
205 01f36c5a8fda
197 01f36c5a8fda
206 01f36c5a8fda
207 $ hg log -r 'divergent()'
198 $ cd ..
208 $ cd ..
199
209
200 split is not divergences
210 split is not divergences
@@ -220,6 +230,7 b' split is not divergences'
220 82623d38b9ba
230 82623d38b9ba
221 392fd25390da
231 392fd25390da
222 392fd25390da
232 392fd25390da
233 $ hg log -r 'divergent()'
223
234
224 Even when subsequente rewriting happen
235 Even when subsequente rewriting happen
225
236
@@ -266,6 +277,7 b' Even when subsequente rewriting happen'
266 e442cfc57690
277 e442cfc57690
267 e442cfc57690
278 e442cfc57690
268 e442cfc57690
279 e442cfc57690
280 $ hg log -r 'divergent()'
269
281
270 Check more complexe obsolescence graft (with divergence)
282 Check more complexe obsolescence graft (with divergence)
271
283
@@ -334,6 +346,11 b' Check more complexe obsolescence graft ('
334 14608b260df8
346 14608b260df8
335 bed64f5d2f5a
347 bed64f5d2f5a
336 bed64f5d2f5a
348 bed64f5d2f5a
349 $ hg log -r 'divergent()'
350 4:01f36c5a8fda A_3
351 8:7ae126973a96 A_7
352 9:14608b260df8 A_8
353 10:bed64f5d2f5a A_9
337
354
338 fix the divergence
355 fix the divergence
339
356
@@ -393,6 +410,7 b' fix the divergence'
393 a139f71be9da
410 a139f71be9da
394 a139f71be9da
411 a139f71be9da
395 a139f71be9da
412 a139f71be9da
413 $ hg log -r 'divergent()'
396
414
397 $ cd ..
415 $ cd ..
398
416
General Comments 0
You need to be logged in to leave comments. Login now