This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10855

clone: reuse the stream clone logic for local clone
ClosedPublic

Authored by marmoute on Jun 9 2021, 10:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG377d8fc20e34: clone: reuse the stream clone logic for local clone
Summary

Streaming clone and local (non --pull) clone do mostly the same thing,
however they were using different logic to do so. This means the logic
frequently went out of sync and that new case had to be dealt with twice.

This is fragile and anoying. So we replace this with a re-use of the logic we
use for streaming clone.

I can see various test changes:

  • a more precise progress output,
  • armless fncache loading during clone,
  • fncache is no longer hardlinked (since we write it by hand).

I am not reinstalling the reposimplestore specific output, as far as I
understand this variant have been broken for years.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jun 9 2021, 10:38 AM
baymax updated this revision to Diff 28577.Jun 15 2021, 10:24 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Jun 16 2021, 5:26 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
mercurial/streamclone.py
844

s/happening/appending/ <- this one is a bit too much

This revision is now accepted and ready to land.Jun 16 2021, 5:26 AM
baymax updated this revision to Diff 28625.Jun 21 2021, 1:09 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG377d8fc20e34: clone: reuse the stream clone logic for local clone.Jun 21 2021, 11:14 AM
Closed by commit rHG377d8fc20e34: clone: reuse the stream clone logic for local clone (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 28577

mercurial/hg.py

sha1nodeconstants, sha1nodeconstants,
short, short,
) )
from .pycompat import getattr from .pycompat import getattr
from . import ( from . import (
bookmarks, bookmarks,
bundlerepo, bundlerepo,
cacheutil,
cmdutil, cmdutil,
destutil, destutil,
discovery, discovery,
error, error,
exchange, exchange,
extensions, extensions,
graphmod, graphmod,
httppeer, httppeer,
destrootpath = urlutil.urllocalpath(dest) destrootpath = urlutil.urllocalpath(dest)
dest_reqs = localrepo.clone_requirements(ui, createopts, srcrepo) dest_reqs = localrepo.clone_requirements(ui, createopts, srcrepo)
localrepo.createrepository( localrepo.createrepository(
ui, ui,
destrootpath, destrootpath,
requirements=dest_reqs, requirements=dest_reqs,
) )
destrepo = localrepo.makelocalrepository(ui, destrootpath) destrepo = localrepo.makelocalrepository(ui, destrootpath)
destlock = destrepo.lock()
from . import streamclone # avoid cycle
destpath = destrepo.vfs.base streamclone.local_copy(srcrepo, destrepo)
destlock = copystore(ui, srcrepo, destpath)
# copy bookmarks over
srcbookmarks = srcrepo.vfs.join(b'bookmarks')
dstbookmarks = os.path.join(destpath, b'bookmarks')
if os.path.exists(srcbookmarks):
util.copyfile(srcbookmarks, dstbookmarks)
dstcachedir = os.path.join(destpath, b'cache')
for cache in cacheutil.cachetocopy(srcrepo):
_copycache(srcrepo, dstcachedir, cache)
# we need to re-init the repo after manually copying the data # we need to re-init the repo after manually copying the data
# into it # into it
destpeer = peer(srcrepo, peeropts, dest) destpeer = peer(srcrepo, peeropts, dest)
srcrepo.hook( srcrepo.hook(
b'outgoing', source=b'clone', node=srcrepo.nodeconstants.nullhex b'outgoing', source=b'clone', node=srcrepo.nodeconstants.nullhex
) )
else: else:

mercurial/streamclone.py

# streamclone.py - producing and consuming streaming repository data # streamclone.py - producing and consuming streaming repository data
# #
# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import contextlib import contextlib
import errno
import os import os
import struct import struct
from .i18n import _ from .i18n import _
from .pycompat import open from .pycompat import open
from .interfaces import repository from .interfaces import repository
from . import ( from . import (
bookmarks,
cacheutil, cacheutil,
error, error,
narrowspec, narrowspec,
phases, phases,
pycompat, pycompat,
requirements as requirementsmod, requirements as requirementsmod,
scmutil, scmutil,
store, store,
util, util,
) )
from .utils import (
stringutil,
)
def canperformstreamclone(pullop, bundle2=False): def canperformstreamclone(pullop, bundle2=False):
"""Whether it is possible to perform a streaming clone as part of pull. """Whether it is possible to perform a streaming clone as part of pull.
``bundle2`` will cause the function to consider stream clone through ``bundle2`` will cause the function to consider stream clone through
bundle2 and only through bundle2. bundle2 and only through bundle2.
# requirements from the streamed-in repository # requirements from the streamed-in repository
repo.requirements = set(requirements) | ( repo.requirements = set(requirements) | (
repo.requirements - repo.supportedformats repo.requirements - repo.supportedformats
) )
repo.svfs.options = localrepo.resolvestorevfsoptions( repo.svfs.options = localrepo.resolvestorevfsoptions(
repo.ui, repo.requirements, repo.features repo.ui, repo.requirements, repo.features
) )
scmutil.writereporequirements(repo) scmutil.writereporequirements(repo)
def _copy_files(src_vfs_map, dst_vfs_map, entries, progress):
hardlink = [True]
def copy_used():
hardlink[0] = False
progress.topic = _(b'copying')
for k, path, size in entries:
src_vfs = src_vfs_map[k]
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)
dst_vfs.register_file(path)
# XXX we could use the #nb_bytes argument.
util.copyfile(
src_path,
dst_path,
hardlink=hardlink[0],
no_hardlink_cb=copy_used,
check_fs_hardlink=False,
)
progress.increment()
return hardlink[0]
def local_copy(src_repo, dest_repo):
"""copy all content from one local repository to another
This is useful for local clone"""
src_store_requirements = {
r
for r in src_repo.requirements
if r not in requirementsmod.WORKING_DIR_REQUIREMENTS
}
dest_store_requirements = {
r
for r in dest_repo.requirements
if r not in requirementsmod.WORKING_DIR_REQUIREMENTS
}
assert src_store_requirements == dest_store_requirements
with dest_repo.lock():
with src_repo.lock():
entries, totalfilesize = _v2_walk(
src_repo,
includes=None,
excludes=None,
includeobsmarkers=True,
)
src_vfs_map = _makemap(src_repo)
dest_vfs_map = _makemap(dest_repo)
progress = src_repo.ui.makeprogress(
topic=_(b'linking'),
total=len(entries),
unit=_(b'files'),
)
# copy files
#
# We could copy the full file while the source repository is locked
# and the other one without the lock. However, in the linking case,
# this would also requires checks that nobody is happening any data
AlphareUnsubmitted
Not Done

s/happening/appending/ <- this one is a bit too much

Alphare: s/happening/appending/ <- this one is a bit too much
# to the files while we do the clone, so this is not done yet. We
# could do this blindly when copying files.
files = ((k, path, size) for k, path, ftype, size in entries)
hardlink = _copy_files(src_vfs_map, dest_vfs_map, files, progress)
# copy bookmarks over
src_book_vfs = bookmarks.bookmarksvfs(src_repo)
srcbookmarks = src_book_vfs.join(b'bookmarks')
dst_book_vfs = bookmarks.bookmarksvfs(dest_repo)
dstbookmarks = dst_book_vfs.join(b'bookmarks')
if os.path.exists(srcbookmarks):
util.copyfile(srcbookmarks, dstbookmarks)
progress.complete()
if hardlink:
msg = b'linked %d files\n'
else:
msg = b'copied %d files\n'
src_repo.ui.debug(msg % len(entries))
with dest_repo.transaction(b"localclone") as tr:
dest_repo.store.write(tr)
# clean up transaction file as they do not make sense
undo_files = [(dest_repo.svfs, b'undo.backupfiles')]
undo_files.extend(dest_repo.undofiles())
for undovfs, undofile in undo_files:
try:
undovfs.unlink(undofile)
except OSError as e:
if e.errno != errno.ENOENT:
msg = _(b'error removing %s: %s\n')
path = undovfs.join(undofile)
e_msg = stringutil.forcebytestr(e)
msg %= (path, e_msg)
dest_repo.ui.warn(msg)

tests/test-clone.t

$ hg clone . '' $ hg clone . ''
abort: empty destination path is not valid abort: empty destination path is not valid
[10] [10]
No update, with debug option: No update, with debug option:
#if hardlink #if hardlink
$ hg --debug clone -U . ../c --config progress.debug=true $ hg --debug clone -U . ../c --config progress.debug=true
linking: 1 files linking: 1/15 files (6.67%)
linking: 2 files linking: 2/15 files (13.33%)
linking: 3 files linking: 3/15 files (20.00%)
linking: 4 files linking: 4/15 files (26.67%)
linking: 5 files linking: 5/15 files (33.33%)
linking: 6 files linking: 6/15 files (40.00%)
linking: 7 files linking: 7/15 files (46.67%)
linking: 8 files linking: 8/15 files (53.33%)
linked 8 files (reporevlogstore !) linking: 9/15 files (60.00%)
linking: 9 files (reposimplestore !) linking: 10/15 files (66.67%)
linking: 10 files (reposimplestore !) linking: 11/15 files (73.33%)
linking: 11 files (reposimplestore !) linking: 12/15 files (80.00%)
linking: 12 files (reposimplestore !) linking: 13/15 files (86.67%)
linking: 13 files (reposimplestore !) linking: 14/15 files (93.33%)
linking: 14 files (reposimplestore !) linking: 15/15 files (100.00%)
linking: 15 files (reposimplestore !) linked 15 files
linking: 16 files (reposimplestore !)
linking: 17 files (reposimplestore !)
linking: 18 files (reposimplestore !)
linked 18 files (reposimplestore !)
updating the branch cache updating the branch cache
#else #else
$ hg --debug clone -U . ../c --config progress.debug=true $ hg --debug clone -U . ../c --config progress.debug=true
linking: 1 files linking: 1 files
copying: 2 files copying: 2 files
copying: 3 files copying: 3 files
copying: 4 files copying: 4 files
copying: 5 files copying: 5 files
copying: 6 files copying: 6 files
copying: 7 files copying: 7 files
copying: 8 files copying: 8 files
copied 8 files (reporevlogstore !)
copying: 9 files (reposimplestore !)
copying: 10 files (reposimplestore !)
copying: 11 files (reposimplestore !)
copying: 12 files (reposimplestore !)
copying: 13 files (reposimplestore !)
copying: 14 files (reposimplestore !)
copying: 15 files (reposimplestore !)
copying: 16 files (reposimplestore !)
copying: 17 files (reposimplestore !)
copying: 18 files (reposimplestore !)
copied 18 files (reposimplestore !)
#endif #endif
$ cd ../c $ cd ../c
Ensure branchcache got copied over: Ensure branchcache got copied over:
$ ls .hg/cache $ ls .hg/cache
branch2-base branch2-base
branch2-immutable branch2-immutable

tests/test-empty.t

checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 0 changesets with 0 changes to 0 files checked 0 changesets with 0 changes to 0 files
$ ls .hg $ ls .hg
00changelog.i 00changelog.i
cache cache
dirstate
hgrc hgrc
requires requires
store store
wcache wcache
Should be empty: Should be empty:
$ ls .hg/store $ ls .hg/store
$ cd .. $ cd ..

tests/test-fncache.t

$ touch .hg/store/data/bar.i $ touch .hg/store/data/bar.i
$ touch bar $ touch bar
$ hg ci -qAm bar $ hg ci -qAm bar
fncache load triggered! fncache load triggered!
Unbundling should follow the same rules; existing files should not cause a load: Unbundling should follow the same rules; existing files should not cause a load:
(loading during the clone is expected)
$ hg clone -q . tobundle $ hg clone -q . tobundle
fncache load triggered!
fncache load triggered!
$ echo 'new line' > tobundle/bar $ echo 'new line' > tobundle/bar
$ hg -R tobundle ci -qm bar $ hg -R tobundle ci -qm bar
$ hg -R tobundle bundle -q barupdated.hg $ hg -R tobundle bundle -q barupdated.hg
$ hg unbundle -q barupdated.hg $ hg unbundle -q barupdated.hg
but adding new files should: but adding new files should:
$ touch tobundle/newfile $ touch tobundle/newfile
$ hg -R tobundle ci -qAm newfile $ hg -R tobundle ci -qAm newfile
$ hg -R tobundle bundle -q newfile.hg $ hg -R tobundle bundle -q newfile.hg
$ hg unbundle -q newfile.hg $ hg unbundle -q newfile.hg
fncache load triggered! fncache load triggered!
$ cd .. $ cd ..

tests/test-hardlinks.t

1 r1/.hg/store/undo.backup.fncache (repofncache !) 1 r1/.hg/store/undo.backup.fncache (repofncache !)
1 r1/.hg/store/undo.backupfiles 1 r1/.hg/store/undo.backupfiles
1 r1/.hg/store/undo.phaseroots 1 r1/.hg/store/undo.phaseroots
Create hardlinked clone r2: Create hardlinked clone r2:
$ hg clone -U --debug r1 r2 --config progress.debug=true $ hg clone -U --debug r1 r2 --config progress.debug=true
linking: 1 files linking: 1/7 files (14.29%)
linking: 2 files linking: 2/7 files (28.57%)
linking: 3 files linking: 3/7 files (42.86%)
linking: 4 files linking: 4/7 files (57.14%)
linking: 5 files linking: 5/7 files (71.43%)
linking: 6 files linking: 6/7 files (85.71%)
linking: 7 files linking: 7/7 files (100.00%)
linked 7 files linked 7 files
updating the branch cache updating the branch cache
Create non-hardlinked clone r3: Create non-hardlinked clone r3:
$ hg clone --pull r1 r3 $ hg clone --pull r1 r3
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 2 changesets with 2 changes to 2 files added 2 changesets with 2 changes to 2 files
new changesets 40d85e9847f2:7069c422939c new changesets 40d85e9847f2:7069c422939c
updating to branch default updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Repos r1 and r2 should now contain hardlinked files: Repos r1 and r2 should now contain hardlinked files:
$ nlinksdir r1/.hg/store $ nlinksdir r1/.hg/store
2 r1/.hg/store/00changelog.i 2 r1/.hg/store/00changelog.i
2 r1/.hg/store/00manifest.i 2 r1/.hg/store/00manifest.i
2 r1/.hg/store/data/d1/f2.i 2 r1/.hg/store/data/d1/f2.i
2 r1/.hg/store/data/f1.i 2 r1/.hg/store/data/f1.i
2 r1/.hg/store/fncache (repofncache !) 1 r1/.hg/store/fncache (repofncache !)
1 r1/.hg/store/phaseroots 1 r1/.hg/store/phaseroots
1 r1/.hg/store/undo 1 r1/.hg/store/undo
1 r1/.hg/store/undo.backup.fncache (repofncache !) 1 r1/.hg/store/undo.backup.fncache (repofncache !)
1 r1/.hg/store/undo.backupfiles 1 r1/.hg/store/undo.backupfiles
1 r1/.hg/store/undo.phaseroots 1 r1/.hg/store/undo.phaseroots
$ nlinksdir r2/.hg/store $ nlinksdir r2/.hg/store
2 r2/.hg/store/00changelog.i 2 r2/.hg/store/00changelog.i
2 r2/.hg/store/00manifest.i 2 r2/.hg/store/00manifest.i
2 r2/.hg/store/data/d1/f2.i 2 r2/.hg/store/data/d1/f2.i
2 r2/.hg/store/data/f1.i 2 r2/.hg/store/data/f1.i
2 r2/.hg/store/fncache (repofncache !) 1 r2/.hg/store/fncache (repofncache !)
Repo r3 should not be hardlinked: Repo r3 should not be hardlinked:
$ nlinksdir r3/.hg/store $ nlinksdir r3/.hg/store
1 r3/.hg/store/00changelog.i 1 r3/.hg/store/00changelog.i
1 r3/.hg/store/00manifest.i 1 r3/.hg/store/00manifest.i
1 r3/.hg/store/data/d1/f2.i 1 r3/.hg/store/data/d1/f2.i
1 r3/.hg/store/data/f1.i 1 r3/.hg/store/data/f1.i
1 r2/.hg/store/00changelog.i 1 r2/.hg/store/00changelog.i
1 r2/.hg/store/00manifest.i 1 r2/.hg/store/00manifest.i
1 r2/.hg/store/data/d1/f2.i 1 r2/.hg/store/data/d1/f2.i
2 r2/.hg/store/data/f1.i 2 r2/.hg/store/data/f1.i
[12] r2/\.hg/store/fncache (re) (repofncache !) [12] r2/\.hg/store/fncache (re) (repofncache !)
#if hardlink-whitelisted repofncache #if hardlink-whitelisted repofncache
$ nlinksdir r2/.hg/store/fncache $ nlinksdir r2/.hg/store/fncache
2 r2/.hg/store/fncache 1 r2/.hg/store/fncache
#endif #endif
$ hg -R r2 verify $ hg -R r2 verify
checking changesets checking changesets
checking manifests checking manifests
crosschecking files in changesets and manifests crosschecking files in changesets and manifests
checking files checking files
checked 2 changesets with 2 changes to 2 files checked 2 changesets with 2 changes to 2 files
$ hg ci -m00 $ hg ci -m00
$ cd .. $ cd ..
$ nlinksdir r2/.hg/store $ nlinksdir r2/.hg/store
1 r2/.hg/store/00changelog.i 1 r2/.hg/store/00changelog.i
1 r2/.hg/store/00manifest.i 1 r2/.hg/store/00manifest.i
1 r2/.hg/store/data/d1/f2.i 1 r2/.hg/store/data/d1/f2.i
1 r2/.hg/store/data/f1.i 1 r2/.hg/store/data/f1.i
[12] r2/\.hg/store/fncache (re) (repofncache !) 1 r2/.hg/store/fncache (repofncache !)
#if hardlink-whitelisted repofncache #if hardlink-whitelisted repofncache
$ nlinksdir r2/.hg/store/fncache $ nlinksdir r2/.hg/store/fncache
2 r2/.hg/store/fncache 1 r2/.hg/store/fncache
#endif #endif
Create a file which exec permissions we will change Create a file which exec permissions we will change
$ cd r3 $ cd r3
$ echo "echo hello world" > f3 $ echo "echo hello world" > f3
$ hg add f3 $ hg add f3
$ hg ci -mf3 $ hg ci -mf3
$ cd .. $ cd ..

tests/test-subrepo-deep-nested-change.t

Preparing the 'sub1' repo which depends on the subrepo 'sub2' Preparing the 'sub1' repo which depends on the subrepo 'sub2'
$ hg init sub1 $ hg init sub1
$ echo sub1 > sub1/sub1 $ echo sub1 > sub1/sub1
$ echo "sub2 = ../sub2" > sub1/.hgsub $ echo "sub2 = ../sub2" > sub1/.hgsub
$ hg clone sub2 sub1/sub2 $ hg clone sub2 sub1/sub2
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [======> ] 1/6\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==============> ] 2/6\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [=====================> ] 3/6\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=============================> ] 4/6\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [====================================> ] 5/6\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [============================================>] 6/6\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
updating [===========================================>] 1/1\r (no-eol) (esc) updating [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R sub1 $ hg add -R sub1
adding sub1/.hgsub adding sub1/.hgsub
adding sub1/sub1 adding sub1/sub1
$ hg commit -R sub1 -m "sub1 import" $ hg commit -R sub1 -m "sub1 import"
Preparing the 'main' repo which depends on the subrepo 'sub1' Preparing the 'main' repo which depends on the subrepo 'sub1'
$ hg init main $ hg init main
$ echo main > main/main $ echo main > main/main
$ echo "sub1 = ../sub1" > main/.hgsub $ echo "sub1 = ../sub1" > main/.hgsub
$ hg clone sub1 main/sub1 $ hg clone sub1 main/sub1
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [====> ] 1/8\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==========> ] 2/8\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [===============> ] 3/8\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=====================> ] 4/8\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [===========================> ] 5/8\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [================================> ] 6/8\r (no-eol) (esc)
linking [ <=> ] 7\r (no-eol) (esc) linking [======================================> ] 7/8\r (no-eol) (esc)
linking [ <=> ] 8\r (no-eol) (esc) linking [============================================>] 8/8\r (no-eol) (esc)
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
updating [===========================================>] 3/3\r (no-eol) (esc) updating [===========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [======> ] 1/6\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==============> ] 2/6\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [=====================> ] 3/6\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=============================> ] 4/6\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [====================================> ] 5/6\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [============================================>] 6/6\r (no-eol) (esc)
updating [===========================================>] 1/1\r (no-eol) (esc) updating [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
updating to branch default updating to branch default
cloning subrepo sub2 from $TESTTMP/sub2 cloning subrepo sub2 from $TESTTMP/sub2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R main $ hg add -R main
adding main/.hgsub adding main/.hgsub
adding main/main adding main/main
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ rm -rf main/sub1 $ rm -rf main/sub1
$ rm -rf sub1/sub2 $ rm -rf sub1/sub2
Clone main Clone main
$ hg --config extensions.largefiles= clone main cloned $ hg --config extensions.largefiles= clone main cloned
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [====> ] 1/8\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==========> ] 2/8\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [===============> ] 3/8\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=====================> ] 4/8\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [===========================> ] 5/8\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [================================> ] 6/8\r (no-eol) (esc)
linking [ <=> ] 7\r (no-eol) (esc) linking [======================================> ] 7/8\r (no-eol) (esc)
linking [ <=> ] 8\r (no-eol) (esc) linking [============================================>] 8/8\r (no-eol) (esc)
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
updating [===========================================>] 3/3\r (no-eol) (esc) updating [===========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [====> ] 1/8\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==========> ] 2/8\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [===============> ] 3/8\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=====================> ] 4/8\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [===========================> ] 5/8\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [================================> ] 6/8\r (no-eol) (esc)
linking [ <=> ] 7\r (no-eol) (esc) linking [======================================> ] 7/8\r (no-eol) (esc)
linking [ <=> ] 8\r (no-eol) (esc) linking [============================================>] 8/8\r (no-eol) (esc)
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
updating [===========================================>] 3/3\r (no-eol) (esc) updating [===========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) (reporevlogstore !) linking [======> ] 1/6\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) (reporevlogstore !) linking [==============> ] 2/6\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) (reporevlogstore !) linking [=====================> ] 3/6\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) (reporevlogstore !) linking [=============================> ] 4/6\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) (reporevlogstore !) linking [====================================> ] 5/6\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) (reporevlogstore !) linking [============================================>] 6/6\r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 2\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 3\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 4\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 5\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 6\r (no-eol) (esc) (reposimplestore !)
updating [===========================================>] 1/1\r (no-eol) (esc) updating [===========================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
updating to branch default updating to branch default
cloning subrepo sub1 from $TESTTMP/sub1 cloning subrepo sub1 from $TESTTMP/sub1
cloning subrepo sub1/sub2 from $TESTTMP/sub2 cloning subrepo sub1/sub2 from $TESTTMP/sub2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Largefiles is NOT enabled in the clone if the source repo doesn't require it Largefiles is NOT enabled in the clone if the source repo doesn't require it

tests/test-subrepo-recursion.t

9 [0-9:\- ]* foo/bar/z.txt (re) 9 [0-9:\- ]* foo/bar/z.txt (re)
Test archiving a revision that references a subrepo that is not yet Test archiving a revision that references a subrepo that is not yet
cloned: cloned:
#if hardlink #if hardlink
$ hg clone -U . ../empty $ hg clone -U . ../empty
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [====> ] 1/9\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [=========> ] 2/9\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [==============> ] 3/9\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [===================> ] 4/9\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [========================> ] 5/9\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [=============================> ] 6/9\r (no-eol) (esc)
linking [ <=> ] 7\r (no-eol) (esc) linking [==================================> ] 7/9\r (no-eol) (esc)
linking [ <=> ] 8\r (no-eol) (esc) linking [=======================================> ] 8/9\r (no-eol) (esc)
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !) linking [============================================>] 9/9\r (no-eol) (esc)
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 11\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 12\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 13\r (no-eol) (esc) (reposimplestore !)
\r (no-eol) (esc) \r (no-eol) (esc)
#else #else
$ hg clone -U . ../empty $ hg clone -U . ../empty
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1 (no-eol) linking [ <=> ] 1 (no-eol)
#endif #endif
$ cd ../empty $ cd ../empty
#if hardlink #if hardlink
$ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz $ hg archive --subrepos -r tip --prefix './' ../archive.tar.gz
\r (no-eol) (esc) \r (no-eol) (esc)
archiving [ ] 0/3\r (no-eol) (esc) archiving [ ] 0/3\r (no-eol) (esc)
archiving [=============> ] 1/3\r (no-eol) (esc) archiving [=============> ] 1/3\r (no-eol) (esc)
archiving [===========================> ] 2/3\r (no-eol) (esc) archiving [===========================> ] 2/3\r (no-eol) (esc)
archiving [==========================================>] 3/3\r (no-eol) (esc) archiving [==========================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [====> ] 1/8\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==========> ] 2/8\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [===============> ] 3/8\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=====================> ] 4/8\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [===========================> ] 5/8\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [================================> ] 6/8\r (no-eol) (esc)
linking [ <=> ] 7\r (no-eol) (esc) linking [======================================> ] 7/8\r (no-eol) (esc)
linking [ <=> ] 8\r (no-eol) (esc) linking [============================================>] 8/8\r (no-eol) (esc)
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 10\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 11\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 12\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 13\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 14\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 15\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 16\r (no-eol) (esc) (reposimplestore !)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
archiving (foo) [ ] 0/3\r (no-eol) (esc) archiving (foo) [ ] 0/3\r (no-eol) (esc)
archiving (foo) [===========> ] 1/3\r (no-eol) (esc) archiving (foo) [===========> ] 1/3\r (no-eol) (esc)
archiving (foo) [=======================> ] 2/3\r (no-eol) (esc) archiving (foo) [=======================> ] 2/3\r (no-eol) (esc)
archiving (foo) [====================================>] 3/3\r (no-eol) (esc) archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
linking [ <=> ] 1\r (no-eol) (esc) linking [======> ] 1/6\r (no-eol) (esc)
linking [ <=> ] 2\r (no-eol) (esc) linking [==============> ] 2/6\r (no-eol) (esc)
linking [ <=> ] 3\r (no-eol) (esc) linking [=====================> ] 3/6\r (no-eol) (esc)
linking [ <=> ] 4\r (no-eol) (esc) linking [=============================> ] 4/6\r (no-eol) (esc)
linking [ <=> ] 5\r (no-eol) (esc) linking [====================================> ] 5/6\r (no-eol) (esc)
linking [ <=> ] 6\r (no-eol) (esc) linking [============================================>] 6/6\r (no-eol) (esc)
linking [ <=> ] 7\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 8\r (no-eol) (esc) (reposimplestore !)
linking [ <=> ] 9\r (no-eol) (esc) (reposimplestore !)
\r (no-eol) (esc) \r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
archiving (foo/bar) [ ] 0/1\r (no-eol) (esc) archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc) archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
cloning subrepo foo from $TESTTMP/repo/foo cloning subrepo foo from $TESTTMP/repo/foo
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
#else #else