# HG changeset patch # User Alexis S. L. Carvalho # Date 2007-06-09 02:49:12 # Node ID cbabc9ac74241b3c962eaf5e19da11cfbd1099bd # Parent 78b6add1f96685998097e7c640fb228470492f55 docopy: use repo.pathto to format paths for printing diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -507,8 +507,8 @@ def docopy(ui, repo, pats, opts, wlock): target = repo.wjoin(abstarget) if prevsrc is not None: ui.warn(_('%s: not overwriting - %s collides with %s\n') % - (reltarget, util.localpath(abssrc), - util.localpath(prevsrc))) + (reltarget, repo.pathto(abssrc, cwd), + repo.pathto(prevsrc, cwd))) return if (not opts['after'] and os.path.exists(target) or opts['after'] and repo.dirstate.state(abstarget) not in '?ar'):