equal
deleted
inserted
replaced
5478 else: |
5478 else: |
5479 # i18n: column positioning for "hg summary" |
5479 # i18n: column positioning for "hg summary" |
5480 ui.write(_('commit: %s\n') % t.strip()) |
5480 ui.write(_('commit: %s\n') % t.strip()) |
5481 |
5481 |
5482 # all ancestors of branch heads - all ancestors of parent = new csets |
5482 # all ancestors of branch heads - all ancestors of parent = new csets |
5483 new = [0] * len(repo) |
5483 new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], |
5484 cl = repo.changelog |
5484 bheads)) |
5485 for a in [cl.rev(n) for n in bheads]: |
|
5486 new[a] = 1 |
|
5487 for a in cl.ancestors([cl.rev(n) for n in bheads]): |
|
5488 new[a] = 1 |
|
5489 for a in [p.rev() for p in parents]: |
|
5490 if a >= 0: |
|
5491 new[a] = 0 |
|
5492 for a in cl.ancestors([p.rev() for p in parents]): |
|
5493 new[a] = 0 |
|
5494 new = sum(new) |
|
5495 |
5485 |
5496 if new == 0: |
5486 if new == 0: |
5497 # i18n: column positioning for "hg summary" |
5487 # i18n: column positioning for "hg summary" |
5498 ui.status(_('update: (current)\n')) |
5488 ui.status(_('update: (current)\n')) |
5499 elif pnode not in bheads: |
5489 elif pnode not in bheads: |