equal
deleted
inserted
replaced
3361 raise error.Abort(msg, hint=hint) |
3361 raise error.Abort(msg, hint=hint) |
3362 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3362 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3363 if clearable and repo.vfs.exists(f): |
3363 if clearable and repo.vfs.exists(f): |
3364 util.unlink(repo.join(f)) |
3364 util.unlink(repo.join(f)) |
3365 |
3365 |
|
3366 afterresolvedstates = [ |
|
3367 ] |
|
3368 |
|
3369 def checkafterresolved(repo): |
|
3370 contmsg = _("continue: %s\n") |
|
3371 for f, msg in afterresolvedstates: |
|
3372 if repo.vfs.exists(f): |
|
3373 repo.ui.warn(contmsg % msg) |
|
3374 return |
|
3375 repo.ui.note(contmsg % _("hg commit")) |
|
3376 |
3366 class dirstateguard(object): |
3377 class dirstateguard(object): |
3367 '''Restore dirstate at unexpected failure. |
3378 '''Restore dirstate at unexpected failure. |
3368 |
3379 |
3369 At the construction, this class does: |
3380 At the construction, this class does: |
3370 |
3381 |