This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10856

clone: also report the bookmark file as copied
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd370256636fe: clone: also report the bookmark file as copied
Summary

This is a small UI adjustement, but this is easy enough to do.

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 28578.Jun 15 2021, 10:24 AM

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

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

You accidentally a word

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

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

marmoute added a commit: rHGd370256636fe: clone: also report the bookmark file as copied.Jun 21 2021, 11:14 AM
Closed by commit rHGd370256636fe: clone: also report the bookmark file as copied (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (22 lines)

Diff 28578

mercurial/streamclone.py

r r
for r in dest_repo.requirements for r in dest_repo.requirements
if r not in requirementsmod.WORKING_DIR_REQUIREMENTS if r not in requirementsmod.WORKING_DIR_REQUIREMENTS
} }
assert src_store_requirements == dest_store_requirements assert src_store_requirements == dest_store_requirements
with dest_repo.lock(): with dest_repo.lock():
with src_repo.lock(): with src_repo.lock():
# bookmark is not integrated to the streaming as it might the
AlphareUnsubmitted
Not Done

You accidentally a word

Alphare: You accidentally a word
# `repo.vfs` and they are too many sentitive data accessible
# through `repo.vfs` to expose it to streaming clone.
src_book_vfs = bookmarks.bookmarksvfs(src_repo)
srcbookmarks = src_book_vfs.join(b'bookmarks')
bm_count = 0
if os.path.exists(srcbookmarks):
bm_count = 1
entries, totalfilesize = _v2_walk( entries, totalfilesize = _v2_walk(
src_repo, src_repo,
includes=None, includes=None,
excludes=None, excludes=None,
includeobsmarkers=True, includeobsmarkers=True,
) )
src_vfs_map = _makemap(src_repo) src_vfs_map = _makemap(src_repo)
dest_vfs_map = _makemap(dest_repo) dest_vfs_map = _makemap(dest_repo)
progress = src_repo.ui.makeprogress( progress = src_repo.ui.makeprogress(
topic=_(b'linking'), topic=_(b'linking'),
total=len(entries), total=len(entries) + bm_count,
unit=_(b'files'), unit=_(b'files'),
) )
# copy files # copy files
# #
# We could copy the full file while the source repository is locked # We could copy the full file while the source repository is locked
# and the other one without the lock. However, in the linking case, # and the other one without the lock. However, in the linking case,
# this would also requires checks that nobody is happening any data # this would also requires checks that nobody is happening any data
# to the files while we do the clone, so this is not done yet. We # to the files while we do the clone, so this is not done yet. We
# could do this blindly when copying files. # could do this blindly when copying files.
files = ((k, path, size) for k, path, ftype, size in entries) files = ((k, path, size) for k, path, ftype, size in entries)
hardlink = _copy_files(src_vfs_map, dest_vfs_map, files, progress) hardlink = _copy_files(src_vfs_map, dest_vfs_map, files, progress)
# copy bookmarks over # copy bookmarks over
src_book_vfs = bookmarks.bookmarksvfs(src_repo) if bm_count:
srcbookmarks = src_book_vfs.join(b'bookmarks')
dst_book_vfs = bookmarks.bookmarksvfs(dest_repo) dst_book_vfs = bookmarks.bookmarksvfs(dest_repo)
dstbookmarks = dst_book_vfs.join(b'bookmarks') dstbookmarks = dst_book_vfs.join(b'bookmarks')
if os.path.exists(srcbookmarks):
util.copyfile(srcbookmarks, dstbookmarks) util.copyfile(srcbookmarks, dstbookmarks)
progress.complete() progress.complete()
if hardlink: if hardlink:
msg = b'linked %d files\n' msg = b'linked %d files\n'
else: else:
msg = b'copied %d files\n' msg = b'copied %d files\n'
src_repo.ui.debug(msg % len(entries)) src_repo.ui.debug(msg % (len(entries) + bm_count))
with dest_repo.transaction(b"localclone") as tr: with dest_repo.transaction(b"localclone") as tr:
dest_repo.store.write(tr) dest_repo.store.write(tr)
# clean up transaction file as they do not make sense # clean up transaction file as they do not make sense
undo_files = [(dest_repo.svfs, b'undo.backupfiles')] undo_files = [(dest_repo.svfs, b'undo.backupfiles')]
undo_files.extend(dest_repo.undofiles()) undo_files.extend(dest_repo.undofiles())
for undovfs, undofile in undo_files: for undovfs, undofile in undo_files: