comparison mercurial/repair.py @ 29953:94ebf56db04e

strip: clarify that user action is required to recover temp bundle

If strip fails when applying the temporary bundle, the commits in the
temporary bundle have not yet been applied, so the user will almost
definitely want to apply the bundle. We should be more clear to the
user about that than our current "partial bundle stored in...".

Note that we will probably not be able to recover it automatically,
since whatever made it fail (e.g. a hook) will most likely make it
fail again. We need to give control back to the user to fix the
problem before trying again.

29952:44ef21621ad7

    except: # re-raises
        if backupfile:
            ui.warn(_("strip failed, full bundle stored in '%s'\n")
                    % vfs.join(backupfile))
        if chgrpfile:
            ui.warn(_("strip failed, partial bundle stored in '%s'\n")
                    % vfs.join(chgrpfile))
        raise
    else:
        if chgrpfile:
            # Remove partial backup only if there were no exceptions
            vfs.unlink(chgrpfile)

29953:94ebf56db04e

    except: # re-raises
        if backupfile:
            ui.warn(_("strip failed, full bundle stored in '%s'\n")
                    % vfs.join(backupfile))
        if chgrpfile:
            ui.warn(_("strip failed, unrecovered changes stored in '%s'\n")
                    % vfs.join(chgrpfile))
            ui.warn(_("(fix the problem, then recover the changesets with "
                      "\"hg unbundle '%s'\")\n") % vfs.join(chgrpfile))
        raise
    else:
        if chgrpfile:
            # Remove partial backup only if there were no exceptions
            vfs.unlink(chgrpfile)