Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 13971:bfeaa88b875d
move canonpath from util to scmutil
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Wed, 20 Apr 2011 21:41:41 +0200 |
| parents | 8b252e826c68 |
| children | d1f4e7fd970a |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Wed Apr 20 19:54:57 2011 +0200 +++ b/mercurial/cmdutil.py Wed Apr 20 21:41:41 2011 +0200 @@ -429,7 +429,7 @@ # relsrc: ossep # otarget: ossep def copyfile(abssrc, relsrc, otarget, exact): - abstarget = util.canonpath(repo.root, cwd, otarget) + abstarget = scmutil.canonpath(repo.root, cwd, otarget) reltarget = repo.pathto(abstarget, cwd) target = repo.wjoin(abstarget) src = repo.wjoin(abssrc) @@ -497,7 +497,7 @@ # return: function that takes hgsep and returns ossep def targetpathfn(pat, dest, srcs): if os.path.isdir(pat): - abspfx = util.canonpath(repo.root, cwd, pat) + abspfx = scmutil.canonpath(repo.root, cwd, pat) abspfx = util.localpath(abspfx) if destdirexists: striplen = len(os.path.split(abspfx)[0]) @@ -523,7 +523,7 @@ res = lambda p: os.path.join(dest, os.path.basename(util.localpath(p))) else: - abspfx = util.canonpath(repo.root, cwd, pat) + abspfx = scmutil.canonpath(repo.root, cwd, pat) if len(abspfx) < len(srcs[0][0]): # A directory. Either the target path contains the last # component of the source path or it does not.