Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 39349:534e451b6dda
rename: emit hint about using --after consistently
Both the code and the message for the case where the source file was
missing was inconsistent with the other similar messages.
Differential Revision: https://phab.mercurial-scm.org/D4418
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 29 Aug 2018 09:54:50 -0700 |
| parents | cde75233c415 |
| children | 5b92a717bfc1 |
comparison
equal
deleted
inserted
replaced
| 39348:cde75233c415 | 39349:534e451b6dda |
|---|---|
| 1252 ui.warn(_('%s: deleted in working directory\n') % relsrc) | 1252 ui.warn(_('%s: deleted in working directory\n') % relsrc) |
| 1253 srcexists = False | 1253 srcexists = False |
| 1254 else: | 1254 else: |
| 1255 ui.warn(_('%s: cannot copy - %s\n') % | 1255 ui.warn(_('%s: cannot copy - %s\n') % |
| 1256 (relsrc, encoding.strtolocal(inst.strerror))) | 1256 (relsrc, encoding.strtolocal(inst.strerror))) |
| 1257 if rename: | |
| 1258 hint = _("('hg rename --after' to record the rename)\n") | |
| 1259 else: | |
| 1260 hint = _("('hg copy --after' to record the copy)\n") | |
| 1257 return True # report a failure | 1261 return True # report a failure |
| 1258 | 1262 |
| 1259 if ui.verbose or not exact: | 1263 if ui.verbose or not exact: |
| 1260 if rename: | 1264 if rename: |
| 1261 ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) | 1265 ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
| 1368 errors = 0 | 1372 errors = 0 |
| 1369 for targetpath, srcs in copylist: | 1373 for targetpath, srcs in copylist: |
| 1370 for abssrc, relsrc, exact in srcs: | 1374 for abssrc, relsrc, exact in srcs: |
| 1371 if copyfile(abssrc, relsrc, targetpath(abssrc), exact): | 1375 if copyfile(abssrc, relsrc, targetpath(abssrc), exact): |
| 1372 errors += 1 | 1376 errors += 1 |
| 1373 | |
| 1374 if errors: | |
| 1375 ui.warn(_('(consider using --after)\n')) | |
| 1376 | 1377 |
| 1377 return errors != 0 | 1378 return errors != 0 |
| 1378 | 1379 |
| 1379 ## facility to let extension process additional data into an import patch | 1380 ## facility to let extension process additional data into an import patch |
| 1380 # list of identifier to be executed in order | 1381 # list of identifier to be executed in order |