Mercurial > hg
changeset 24954:e47feee55bf7
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.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 04 May 2015 23:04:12 -0400 |
| parents | 5115d03440f4 |
| children | 1df233bcb7f6 |
| files | hgext/largefiles/overrides.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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