This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4418

rename: emit hint about using --after consistently
ClosedPublic

Authored by martinvonz on Aug 29 2018, 1:47 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG534e451b6dda: rename: emit hint about using --after consistently
Summary

Both the code and the message for the case where the source file was
missing was inconsistent with the other similar messages.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 29 2018, 1:47 PM
pulkit accepted this revision.Aug 29 2018, 3:23 PM
pulkit added a subscriber: pulkit.

Strange that there are no tests for this codepath.

Closed by commit rHG534e451b6dda: rename: emit hint about using --after consistently (authored by martinvonz). · Explain WhyAug 29 2018, 3:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (7 lines)

Diff 10646

mercurial/cmdutil.py

srcexists = True srcexists = True
except IOError as inst: except IOError as inst:
if inst.errno == errno.ENOENT: if inst.errno == errno.ENOENT:
ui.warn(_('%s: deleted in working directory\n') % relsrc) ui.warn(_('%s: deleted in working directory\n') % relsrc)
srcexists = False srcexists = False
else: else:
ui.warn(_('%s: cannot copy - %s\n') % ui.warn(_('%s: cannot copy - %s\n') %
(relsrc, encoding.strtolocal(inst.strerror))) (relsrc, encoding.strtolocal(inst.strerror)))
if rename:
hint = _("('hg rename --after' to record the rename)\n")
else:
hint = _("('hg copy --after' to record the copy)\n")
return True # report a failure return True # report a failure
if ui.verbose or not exact: if ui.verbose or not exact:
if rename: if rename:
ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
else: else:
ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
raise error.Abort(_('no files to copy')) raise error.Abort(_('no files to copy'))
errors = 0 errors = 0
for targetpath, srcs in copylist: for targetpath, srcs in copylist:
for abssrc, relsrc, exact in srcs: for abssrc, relsrc, exact in srcs:
if copyfile(abssrc, relsrc, targetpath(abssrc), exact): if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
errors += 1 errors += 1
if errors:
ui.warn(_('(consider using --after)\n'))
return errors != 0 return errors != 0
## facility to let extension process additional data into an import patch ## facility to let extension process additional data into an import patch
# list of identifier to be executed in order # list of identifier to be executed in order
extrapreimport = [] # run before commit extrapreimport = [] # run before commit
extrapostimport = [] # run after commit extrapostimport = [] # run after commit
# mapping from identifier to actual import function # mapping from identifier to actual import function
# #