Mercurial > hg
changeset 18150:14e31a631e41
largefiles: use plain wjoin instead of the complex pathto
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 13 Dec 2012 19:19:06 +0100 |
| parents | 2dcc3653b361 |
| children | 90ad387d9245 |
| files | hgext/largefiles/lfutil.py hgext/largefiles/overrides.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py Fri Dec 28 11:55:57 2012 +0100 +++ b/hgext/largefiles/lfutil.py Thu Dec 13 19:19:06 2012 +0100 @@ -248,7 +248,7 @@ def getstandinmatcher(repo, pats=[], opts={}): '''Return a match object that applies pats to the standin directory''' - standindir = repo.pathto(shortname) + standindir = repo.wjoin(shortname) if pats: # patterns supplied: search standin directory relative to current dir cwd = repo.getcwd()
--- a/hgext/largefiles/overrides.py Fri Dec 28 11:55:57 2012 +0100 +++ b/hgext/largefiles/overrides.py Thu Dec 13 19:19:06 2012 +0100 @@ -755,7 +755,7 @@ # .hg/largefiles, and the standin matcher won't match anything anyway.) if 'largefiles' in repo.requirements: if opts.get('noupdate'): - util.makedirs(repo.pathto(lfutil.shortname)) + util.makedirs(repo.wjoin(lfutil.shortname)) util.makedirs(repo.join(lfutil.longname)) # Caching is implicitly limited to 'rev' option, since the dest repo was