Show More
@@ -221,7 +221,12 b' def copytostore(repo, rev, file, uploade' | |||||
221 | hash = readstandin(repo, file, rev) |
|
221 | hash = readstandin(repo, file, rev) | |
222 | if instore(repo, hash): |
|
222 | if instore(repo, hash): | |
223 | return |
|
223 | return | |
224 |
|
|
224 | absfile = repo.wjoin(file) | |
|
225 | if os.path.exists(absfile): | |||
|
226 | copytostoreabsolute(repo, absfile, hash) | |||
|
227 | else: | |||
|
228 | repo.ui.warn(_("%s: largefile %s not available from local store\n") % | |||
|
229 | (file, hash)) | |||
225 |
|
230 | |||
226 | def copyalltostore(repo, node): |
|
231 | def copyalltostore(repo, node): | |
227 | '''Copy all largefiles in a given revision to the store''' |
|
232 | '''Copy all largefiles in a given revision to the store''' |
@@ -158,9 +158,17 b' mark the non-existing file as normal in ' | |||||
158 | 0 largefiles updated, 0 removed |
|
158 | 0 largefiles updated, 0 removed | |
159 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
159 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
160 | (branch merge, don't forget to commit) |
|
160 | (branch merge, don't forget to commit) | |
161 | $ hg commit -m '1-2-3 testing' |
|
161 | $ hg commit -m '1-2-3 testing' --config largefiles.usercache=not | |
|
162 | large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from local store | |||
|
163 | $ hg up -C . --config largefiles.usercache=not | |||
|
164 | getting changed largefiles | |||
|
165 | large1: largefile 58e24f733a964da346e2407a2bee99d9001184f5 not available from file:/*/$TESTTMP/repo (glob) | |||
|
166 | 0 largefiles updated, 0 removed | |||
|
167 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
168 | $ hg st large1 | |||
|
169 | ! large1 | |||
162 | $ hg rollback -q |
|
170 | $ hg rollback -q | |
163 |
$ |
|
171 | $ mv 58e24f733a964da346e2407a2bee99d9001184f5 .hg/largefiles/ | |
164 |
|
172 | |||
165 | Test that "hg revert -r REV" updates largefiles from "REV" correctly |
|
173 | Test that "hg revert -r REV" updates largefiles from "REV" correctly | |
166 |
|
174 |
General Comments 0
You need to be logged in to leave comments.
Login now