##// END OF EJS Templates
clone: properly create target directories during local clone (issue6581)...
marmoute -
r48685:132525ea stable
parent child Browse files
Show More
@@ -821,9 +821,11 b' def _copy_files(src_vfs_map, dst_vfs_map'
821 dst_vfs = dst_vfs_map[k]
821 dst_vfs = dst_vfs_map[k]
822 src_path = src_vfs.join(path)
822 src_path = src_vfs.join(path)
823 dst_path = dst_vfs.join(path)
823 dst_path = dst_vfs.join(path)
824 dirname = dst_vfs.dirname(path)
824 # We cannot use dirname and makedirs of dst_vfs here because the store
825 if not dst_vfs.exists(dirname):
825 # encoding confuses them. See issue 6581 for details.
826 dst_vfs.makedirs(dirname)
826 dirname = os.path.dirname(dst_path)
827 if not os.path.exists(dirname):
828 util.makedirs(dirname)
827 dst_vfs.register_file(path)
829 dst_vfs.register_file(path)
828 # XXX we could use the #nb_bytes argument.
830 # XXX we could use the #nb_bytes argument.
829 util.copyfile(
831 util.copyfile(
@@ -177,21 +177,17 b' The logic is close enough of uncompresse'
177 This is present here to reuse the testing around file with "special" names.
177 This is present here to reuse the testing around file with "special" names.
178
178
179 $ hg clone server local-clone
179 $ hg clone server local-clone
180 updating to branch default (missing-correct-output !)
180 updating to branch default
181 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved (missing-correct-output !)
181 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved
182 abort: $ENOENT$: '$TESTTMP/local-clone/.hg/store/dh/containe/isam-bui/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4d94041277bcd011e1d54c247523c124b4a325686.i' (known-bad-output !)
183 [255]
184
182
185 Check that the clone went well
183 Check that the clone went well
186
184
187 $ hg verify -R local-clone
185 $ hg verify -R local-clone
188 checking changesets (missing-correct-output !)
186 checking changesets
189 checking manifests (missing-correct-output !)
187 checking manifests
190 crosschecking files in changesets and manifests (missing-correct-output !)
188 crosschecking files in changesets and manifests
191 checking files (missing-correct-output !)
189 checking files
192 checked 3 changesets with 1088 changes to 1088 files (missing-correct-output !)
190 checked 3 changesets with 1088 changes to 1088 files
193 abort: repository local-clone not found (known-bad-output !)
194 [255]
195
191
196 Check uncompressed
192 Check uncompressed
197 ==================
193 ==================
General Comments 0
You need to be logged in to leave comments. Login now