Mercurial > hg-stable
comparison mercurial/commands.py @ 14055:421d56a055fd
drop {short,hex}(ctx.node()) calls in favor of ctx methods
| author | Alexander Solovyov <alexander@solovyov.net> |
|---|---|
| date | Sat, 30 Apr 2011 12:55:07 +0200 |
| parents | 58e58406ed19 |
| children | e4bfb9c337f3 |
comparison
equal
deleted
inserted
replaced
| 14054:3c616f512a5b | 14055:421d56a055fd |
|---|---|
| 349 if good: | 349 if good: |
| 350 ui.write(_("The first good revision is:\n")) | 350 ui.write(_("The first good revision is:\n")) |
| 351 else: | 351 else: |
| 352 ui.write(_("The first bad revision is:\n")) | 352 ui.write(_("The first bad revision is:\n")) |
| 353 displayer.show(repo[nodes[0]]) | 353 displayer.show(repo[nodes[0]]) |
| 354 parents = repo[nodes[0]].parents() | |
| 355 extendnode = extendbisectrange(nodes, good) | 354 extendnode = extendbisectrange(nodes, good) |
| 356 if extendnode is not None: | 355 if extendnode is not None: |
| 357 ui.write(_('Not all ancestors of this changeset have been' | 356 ui.write(_('Not all ancestors of this changeset have been' |
| 358 ' checked.\nUse bisect --extend to continue the ' | 357 ' checked.\nUse bisect --extend to continue the ' |
| 359 'bisection from\nthe common ancestor, %s.\n') | 358 'bisection from\nthe common ancestor, %s.\n') |
| 360 % short(extendnode.node())) | 359 % extendnode) |
| 361 else: | 360 else: |
| 362 # multiple possible revisions | 361 # multiple possible revisions |
| 363 if good: | 362 if good: |
| 364 ui.write(_("Due to skipped revisions, the first " | 363 ui.write(_("Due to skipped revisions, the first " |
| 365 "good revision could be any of:\n")) | 364 "good revision could be any of:\n")) |
| 457 if extend: | 456 if extend: |
| 458 if not changesets: | 457 if not changesets: |
| 459 extendnode = extendbisectrange(nodes, good) | 458 extendnode = extendbisectrange(nodes, good) |
| 460 if extendnode is not None: | 459 if extendnode is not None: |
| 461 ui.write(_("Extending search to changeset %d:%s\n" | 460 ui.write(_("Extending search to changeset %d:%s\n" |
| 462 % (extendnode.rev(), short(extendnode.node())))) | 461 % (extendnode.rev(), extendnode))) |
| 463 if noupdate: | 462 if noupdate: |
| 464 return | 463 return |
| 465 cmdutil.bail_if_changed(repo) | 464 cmdutil.bail_if_changed(repo) |
| 466 return hg.clean(repo, extendnode.node()) | 465 return hg.clean(repo, extendnode.node()) |
| 467 raise util.Abort(_("nothing to extend")) | 466 raise util.Abort(_("nothing to extend")) |