facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

largefiles: fix the directory structure when archiving a subrepo in a subrepo

Browse Source 
Previously, a repo consisting of main/sub/subsub archived sub and subsub as
siblings under main.
This commit is contained in:
Matt Harbison 2012-06-18 23:02:51 -04:00
parent bf6dae387d
commit c16332f051
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext/largefiles/overrides.py
View File

@ -850,7 +850,7 @@ def hgsubrepoarchive(orig, repo, ui, archiver, prefix):
for subpath in ctx.substate:
sub = ctx.sub(subpath)
sub.archive(ui, archiver, prefix)
sub.archive(ui, archiver, os.path.join(prefix, repo._path) + '/')
# If a largefile is modified, the change is not reflected in its
# standin until a commit. cmdutil.bailifchanged() raises an exception

6
tests/test-subrepo-deep-nested-change.t
View File

@ -125,8 +125,8 @@ Note that add --large through a subrepo currently adds the file as a normal file
../archive_lf/sub1/.hgsub
../archive_lf/sub1/.hgsubstate
../archive_lf/sub1/sub1
../archive_lf/sub2
../archive_lf/sub2/large.bin
../archive_lf/sub2/sub2
../archive_lf/sub1/sub2
../archive_lf/sub1/sub2/large.bin
../archive_lf/sub1/sub2/sub2
$ cd ..