Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 4526:cbabc9ac7424
docopy: use repo.pathto to format paths for printing
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 08 Jun 2007 23:49:12 -0300 |
| parents | 78b6add1f966 |
| children | af02e6078d08 |
comparison
equal
deleted
inserted
replaced
| 4525:78b6add1f966 | 4526:cbabc9ac7424 |
|---|---|
| 505 prevsrc = targets.get(abstarget) | 505 prevsrc = targets.get(abstarget) |
| 506 src = repo.wjoin(abssrc) | 506 src = repo.wjoin(abssrc) |
| 507 target = repo.wjoin(abstarget) | 507 target = repo.wjoin(abstarget) |
| 508 if prevsrc is not None: | 508 if prevsrc is not None: |
| 509 ui.warn(_('%s: not overwriting - %s collides with %s\n') % | 509 ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
| 510 (reltarget, util.localpath(abssrc), | 510 (reltarget, repo.pathto(abssrc, cwd), |
| 511 util.localpath(prevsrc))) | 511 repo.pathto(prevsrc, cwd))) |
| 512 return | 512 return |
| 513 if (not opts['after'] and os.path.exists(target) or | 513 if (not opts['after'] and os.path.exists(target) or |
| 514 opts['after'] and repo.dirstate.state(abstarget) not in '?ar'): | 514 opts['after'] and repo.dirstate.state(abstarget) not in '?ar'): |
| 515 if not opts['force']: | 515 if not opts['force']: |
| 516 ui.warn(_('%s: not overwriting - file exists\n') % | 516 ui.warn(_('%s: not overwriting - file exists\n') % |