# HG changeset patch # User Matt Harbison # Date 1430795052 14400 # Node ID e47feee55bf7a422f5e2f67ab84ae457cc7d3e86 # Parent 5115d03440f41966c4a8711296cfc4cb6636ee84 largefiles: drop os.path.join() in subrepo archive override This is related to 41cd8171e58f, but not required for that to function correctly because 'prefix' always ends with '/', so os.path.join(prefix, _path) simply concatenates the strings. Take the opportunity to drop the os.path usage, and avoid confusion by using the same pattern as the overridden subrepo method. diff -r 5115d03440f4 -r e47feee55bf7 hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py Tue May 05 20:52:38 2015 -0400 +++ b/hgext/largefiles/overrides.py Mon May 04 23:04:12 2015 -0400 @@ -985,7 +985,7 @@ for subpath in sorted(ctx.substate): sub = ctx.sub(subpath) submatch = match_.narrowmatcher(subpath, match) - sub.archive(archiver, os.path.join(prefix, repo._path) + '/', submatch) + sub.archive(archiver, prefix + repo._path + '/', submatch) # If a largefile is modified, the change is not reflected in its # standin until a commit. cmdutil.bailifchanged() raises an exception