##// END OF EJS Templates
rename: emit hint about using --after consistently...
Martin von Zweigbergk -
r39385:534e451b default
parent child Browse files
Show More
@@ -1254,6 +1254,10 b' def copy(ui, repo, pats, opts, rename=Fa'
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:
@@ -1371,9 +1375,6 b' def copy(ui, repo, pats, opts, rename=Fa'
1371 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1375 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1372 errors += 1
1376 errors += 1
1373
1377
1374 if errors:
1375 ui.warn(_('(consider using --after)\n'))
1376
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
General Comments 0
You need to be logged in to leave comments. Login now