equal
deleted
inserted
replaced
17 - alters core commands and extensions that rewrite history to use |
17 - alters core commands and extensions that rewrite history to use |
18 this feature, |
18 this feature, |
19 - improves some aspect of the early implementation in Mercurial core |
19 - improves some aspect of the early implementation in Mercurial core |
20 ''' |
20 ''' |
21 |
21 |
22 __version__ = '5.0.0' |
22 __version__ = '5.0.1' |
23 testedwith = '3.2' |
23 testedwith = '3.2' |
24 buglink = 'http://bz.selenic.com/' |
24 buglink = 'http://bz.selenic.com/' |
25 |
25 |
26 import sys, os |
26 import sys, os |
27 import random |
27 import random |
1574 newer = obsolete.successorssets(ctx._repo, base.node()) |
1574 newer = obsolete.successorssets(ctx._repo, base.node()) |
1575 # drop filter and solution including the original ctx |
1575 # drop filter and solution including the original ctx |
1576 newer = [n for n in newer if n and ctx.node() not in n] |
1576 newer = [n for n in newer if n and ctx.node() not in n] |
1577 if newer: |
1577 if newer: |
1578 return base, tuple(ctx._repo[o] for o in newer[0]) |
1578 return base, tuple(ctx._repo[o] for o in newer[0]) |
1579 raise util.Abort('base of divergent changeset not found', |
1579 raise util.Abort("base of divergent changeset %s not found" % ctx, |
1580 hint='this case is not yet handled') |
1580 hint='this case is not yet handled') |
1581 |
1581 |
1582 |
1582 |
1583 |
1583 |
1584 shorttemplate = '[{rev}] {desc|firstline}\n' |
1584 shorttemplate = '[{rev}] {desc|firstline}\n' |