[PATCH 07 of 13] largefiles: use plain wjoin instead of the complex pathto
Mads Kiilerich
kiilerix at gmail.com
Fri Dec 21 13:06:56 CST 2012
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1355422746 -3600
# Node ID 154e52eaae10447e618f88210b7c7f47dcd3fa5e
# Parent cb2b640dd5a4a464eaf397154862084394926aff
largefiles: use plain wjoin instead of the complex pathto
diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py
+++ b/hgext/largefiles/lfutil.py
@@ -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()
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -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
More information about the Mercurial-devel
mailing list