Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 4229:24c22a3f2ef8
pass repo.root to util.pathto() in preparation for the next patch
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 16 Mar 2007 00:22:57 -0300 |
| parents | 281f9f8f1bd4 |
| children | 83153299aab5 |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Mar 16 00:22:55 2007 -0300 +++ b/mercurial/commands.py Fri Mar 16 00:22:57 2007 -0300 @@ -487,7 +487,7 @@ # target: ossep def copy(origsrc, abssrc, relsrc, target, exact): abstarget = util.canonpath(repo.root, cwd, target) - reltarget = util.pathto(cwd, abstarget) + reltarget = util.pathto(repo.root, cwd, abstarget) prevsrc = targets.get(abstarget) if prevsrc is not None: ui.warn(_('%s: not overwriting - %s collides with %s\n') % @@ -2418,11 +2418,12 @@ format = "%s %%s%s" % (char, end) for f in changes: - ui.write(format % util.pathto(cwd, f)) + ui.write(format % util.pathto(repo.root, cwd, f)) if ((all or opts.get('copies')) and not opts.get('no_status')): copied = repo.dirstate.copied(f) if copied: - ui.write(' %s%s' % (util.pathto(cwd, copied), end)) + ui.write(' %s%s' % (util.pathto(repo.root, cwd, copied), + end)) def tag(ui, repo, name, rev_=None, **opts): """add a tag for the current or given revision