# HG changeset patch # User Pierre-Yves David # Date 1629883969 -7200 # Node ID 132525ead0db34841150d5db68f232b42eba5ceb # Parent 67af3b3173b79cd255a843d6754f914eb7d75c0a clone: properly create target directories during local clone (issue6581) The store encoding was mudding the water. This lead to local clone crashing for file with long filename as their destination directory needed to be encoded. Differential Revision: https://phab.mercurial-scm.org/D11340 diff -r 67af3b3173b7 -r 132525ead0db mercurial/streamclone.py --- a/mercurial/streamclone.py Wed Aug 25 10:00:55 2021 +0200 +++ b/mercurial/streamclone.py Wed Aug 25 11:32:49 2021 +0200 @@ -821,9 +821,11 @@ dst_vfs = dst_vfs_map[k] src_path = src_vfs.join(path) dst_path = dst_vfs.join(path) - dirname = dst_vfs.dirname(path) - if not dst_vfs.exists(dirname): - dst_vfs.makedirs(dirname) + # We cannot use dirname and makedirs of dst_vfs here because the store + # encoding confuses them. See issue 6581 for details. + dirname = os.path.dirname(dst_path) + if not os.path.exists(dirname): + util.makedirs(dirname) dst_vfs.register_file(path) # XXX we could use the #nb_bytes argument. util.copyfile( diff -r 67af3b3173b7 -r 132525ead0db tests/test-clone-uncompressed.t --- a/tests/test-clone-uncompressed.t Wed Aug 25 10:00:55 2021 +0200 +++ b/tests/test-clone-uncompressed.t Wed Aug 25 11:32:49 2021 +0200 @@ -177,21 +177,17 @@ This is present here to reuse the testing around file with "special" names. $ hg clone server local-clone - updating to branch default (missing-correct-output !) - 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved (missing-correct-output !) - abort: $ENOENT$: '$TESTTMP/local-clone/.hg/store/dh/containe/isam-bui/bazel-coverage-generator-sandboxfs-compatibility-0758e3e4d94041277bcd011e1d54c247523c124b4a325686.i' (known-bad-output !) - [255] + updating to branch default + 1088 files updated, 0 files merged, 0 files removed, 0 files unresolved Check that the clone went well $ hg verify -R local-clone - checking changesets (missing-correct-output !) - checking manifests (missing-correct-output !) - crosschecking files in changesets and manifests (missing-correct-output !) - checking files (missing-correct-output !) - checked 3 changesets with 1088 changes to 1088 files (missing-correct-output !) - abort: repository local-clone not found (known-bad-output !) - [255] + checking changesets + checking manifests + crosschecking files in changesets and manifests + checking files + checked 3 changesets with 1088 changes to 1088 files Check uncompressed ==================