Mercurial > hg
changeset 15553:e89385e4ef8d stable
largefiles: file storage should be relative to repo, not relative to cwd
Revealed by the test in 1fd126cd2d91.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 22 Nov 2011 19:52:23 +0100 |
| parents | 62c9183a0bbb |
| children | 0c0ed2b3082d |
| files | hgext/largefiles/lfutil.py tests/test-largefiles.t |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py Tue Nov 22 12:06:42 2011 -0600 +++ b/hgext/largefiles/lfutil.py Tue Nov 22 19:52:23 2011 +0100 @@ -156,7 +156,7 @@ hash = readstandin(repo, lfile) lfdirstate.normallookup(lfile) try: - if hash == hashfile(lfile): + if hash == hashfile(repo.wjoin(lfile)): lfdirstate.normal(lfile) except OSError, err: if err.errno != errno.ENOENT:
--- a/tests/test-largefiles.t Tue Nov 22 12:06:42 2011 -0600 +++ b/tests/test-largefiles.t Tue Nov 22 19:52:23 2011 +0100 @@ -257,6 +257,12 @@ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved getting changed largefiles 3 largefiles updated, 0 removed + $ hg debugstate --nodates + n 644 41 .hglf/sub/large4 + n 0 -1 .hglf/sub2/large6 + n 0 -1 .hglf/sub2/large7 + n 644 9 normal3 + n 644 9 sub/normal4 $ cd ../b $ hg log --template '{rev}:{node|short} {desc|firstline}\n' 7:daea875e9014 add/edit more largefiles