Mercurial > hg-stable
comparison hgext/rebase.py @ 12861:1c57a66bf985 stable
rebase: abort message should appear even with --quiet
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Tue, 26 Oct 2010 14:41:58 +0300 |
| parents | 0793d763e413 |
| children | b19b4c1df066 |
comparison
equal
deleted
inserted
replaced
| 12860:db2ff771204d | 12861:1c57a66bf985 |
|---|---|
| 449 if rebased: | 449 if rebased: |
| 450 strippoint = min(rebased) | 450 strippoint = min(rebased) |
| 451 # no backup of rebased cset versions needed | 451 # no backup of rebased cset versions needed |
| 452 repair.strip(repo.ui, repo, repo[strippoint].node()) | 452 repair.strip(repo.ui, repo, repo[strippoint].node()) |
| 453 clearstatus(repo) | 453 clearstatus(repo) |
| 454 repo.ui.status(_('rebase aborted\n')) | 454 repo.ui.warn(_('rebase aborted\n')) |
| 455 return 0 | 455 return 0 |
| 456 | 456 |
| 457 def buildstate(repo, dest, src, base, detach): | 457 def buildstate(repo, dest, src, base, detach): |
| 458 'Define which revisions are going to be rebased and where' | 458 'Define which revisions are going to be rebased and where' |
| 459 targetancestors = set() | 459 targetancestors = set() |