Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 39377:5b92a717bfc1
rename: return error status if any rename/copy failed
Ever since 447ea621e50e (copy: propagate errors properly, 2007-12-06),
we have returned an error status if the source file did not
exist. That commit did not return error status for any other errors,
and it's unclear if that was on purpose or not. It seems to me like we
should return an error in the other cases to, so that's what this
patch does.
Differential Revision: https://phab.mercurial-scm.org/D4419
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 29 Aug 2018 09:59:08 -0700 |
| parents | 534e451b6dda |
| children | 34ba47117164 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Wed Aug 29 09:54:50 2018 -0700 +++ b/mercurial/cmdutil.py Wed Aug 29 09:59:08 2018 -0700 @@ -1184,7 +1184,7 @@ ui.warn(_('%s: not overwriting - %s collides with %s\n') % (reltarget, repo.pathto(abssrc, cwd), repo.pathto(prevsrc, cwd))) - return + return True # report a failure # check for overwrites exists = os.path.lexists(target) @@ -1194,7 +1194,7 @@ repo.dirstate.normalize(abstarget)): if not rename: ui.warn(_("%s: can't copy - same file\n") % reltarget) - return + return True # report a failure exists = False samefile = True @@ -1220,7 +1220,7 @@ hint = _("('hg copy --after' to record the copy)\n") ui.warn(msg % reltarget) ui.warn(hint) - return + return True # report a failure if after: if not exists: @@ -1230,7 +1230,7 @@ else: ui.warn(_('%s: not recording copy - %s does not exist\n') % (relsrc, reltarget)) - return + return True # report a failure elif not dryrun: try: if exists: