Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 7894:caef5fdf1375
cmdutil: fix untranslatable string in copy
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Fri, 27 Mar 2009 17:35:00 +0100 |
| parents | 5c4026a289a4 |
| children | de377b1a9a84 |
comparison
equal
deleted
inserted
replaced
| 7893:606723f4a327 | 7894:caef5fdf1375 |
|---|---|
| 383 ui.warn(_('%s: cannot copy - %s\n') % | 383 ui.warn(_('%s: cannot copy - %s\n') % |
| 384 (relsrc, inst.strerror)) | 384 (relsrc, inst.strerror)) |
| 385 return True # report a failure | 385 return True # report a failure |
| 386 | 386 |
| 387 if ui.verbose or not exact: | 387 if ui.verbose or not exact: |
| 388 action = rename and "moving" or "copying" | 388 if rename: |
| 389 ui.status(_('%s %s to %s\n') % (action, relsrc, reltarget)) | 389 ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
| 390 else: | |
| 391 ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | |
| 390 | 392 |
| 391 targets[abstarget] = abssrc | 393 targets[abstarget] = abssrc |
| 392 | 394 |
| 393 # fix up dirstate | 395 # fix up dirstate |
| 394 origsrc = repo.dirstate.copied(abssrc) or abssrc | 396 origsrc = repo.dirstate.copied(abssrc) or abssrc |