Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.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 | d13913355390 |
| children | 19a7b48446e3 |
line wrap: on
line diff
--- a/mercurial/patch.py Wed Apr 20 19:54:57 2011 +0200 +++ b/mercurial/patch.py Wed Apr 20 21:41:41 2011 +0200 @@ -21,7 +21,8 @@ # helper functions def copyfile(src, dst, basedir): - abssrc, absdst = [util.canonpath(basedir, basedir, x) for x in [src, dst]] + abssrc, absdst = [scmutil.canonpath(basedir, basedir, x) + for x in [src, dst]] if os.path.lexists(absdst): raise util.Abort(_("cannot create %s: destination already exists") % dst)