Show More
@@ -3208,8 +3208,16 b' def checkunfinished(repo, commit=False):' | |||||
3208 | if found. It's probably good to check this right before |
|
3208 | if found. It's probably good to check this right before | |
3209 | bailifchanged(). |
|
3209 | bailifchanged(). | |
3210 | ''' |
|
3210 | ''' | |
|
3211 | # Check for non-clearable states first, so things like rebase will take | |||
|
3212 | # precedence over update. | |||
3211 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
3213 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
3212 | if commit and allowcommit: |
|
3214 | if clearable or (commit and allowcommit): | |
|
3215 | continue | |||
|
3216 | if repo.vfs.exists(f): | |||
|
3217 | raise error.Abort(msg, hint=hint) | |||
|
3218 | ||||
|
3219 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |||
|
3220 | if not clearable or (commit and allowcommit): | |||
3213 | continue |
|
3221 | continue | |
3214 | if repo.vfs.exists(f): |
|
3222 | if repo.vfs.exists(f): | |
3215 | raise error.Abort(msg, hint=hint) |
|
3223 | raise error.Abort(msg, hint=hint) |
@@ -387,10 +387,9 b' New operations are blocked with the corr' | |||||
387 | .hg/undo.dirstate |
|
387 | .hg/undo.dirstate | |
388 | .hg/updatestate |
|
388 | .hg/updatestate | |
389 |
|
389 | |||
390 | XXX: This should complain about needing to abort/continue rebase |
|
|||
391 | $ hg rebase -s 3 -d tip |
|
390 | $ hg rebase -s 3 -d tip | |
392 | abort: last update was interrupted |
|
391 | abort: rebase in progress | |
393 | (use 'hg update' to get a consistent checkout) |
|
392 | (use 'hg rebase --continue' or 'hg rebase --abort') | |
394 | [255] |
|
393 | [255] | |
395 | $ hg up . |
|
394 | $ hg up . | |
396 | abort: rebase in progress |
|
395 | abort: rebase in progress | |
@@ -401,10 +400,9 b' XXX: This should complain about needing ' | |||||
401 | (use 'hg rebase --continue' or 'hg rebase --abort') |
|
400 | (use 'hg rebase --continue' or 'hg rebase --abort') | |
402 | [255] |
|
401 | [255] | |
403 |
|
402 | |||
404 | XXX: This should complain about needing to abort/continue rebase |
|
|||
405 | $ hg graft 3 |
|
403 | $ hg graft 3 | |
406 | abort: last update was interrupted |
|
404 | abort: rebase in progress | |
407 | (use 'hg update' to get a consistent checkout) |
|
405 | (use 'hg rebase --continue' or 'hg rebase --abort') | |
408 | [255] |
|
406 | [255] | |
409 |
|
407 | |||
410 | $ hg rebase --abort |
|
408 | $ hg rebase --abort |
General Comments 0
You need to be logged in to leave comments.
Login now