[Commented On] D10856: clone: also report the bookmark file as copied
baymax (Baymax, Your Personal Patch-care Companion)
phabricator at mercurial-scm.org
Mon Jun 21 05:10:46 UTC 2021
baymax added a comment.
baymax updated this revision to Diff 28626.
✅ refresh by Heptapod after a successful CI run (🐙 💚)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D10856?vs=28578&id=28626
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D10856/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D10856
AFFECTED FILES
mercurial/streamclone.py
CHANGE DETAILS
diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py
--- a/mercurial/streamclone.py
+++ b/mercurial/streamclone.py
@@ -824,6 +824,16 @@
with dest_repo.lock():
with src_repo.lock():
+
+ # bookmark is not integrated to the streaming as it might use the
+ # `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(
src_repo,
includes=None,
@@ -834,7 +844,7 @@
dest_vfs_map = _makemap(dest_repo)
progress = src_repo.ui.makeprogress(
topic=_(b'linking'),
- total=len(entries),
+ total=len(entries) + bm_count,
unit=_(b'files'),
)
# copy files
@@ -848,18 +858,16 @@
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):
+ if bm_count:
+ dst_book_vfs = bookmarks.bookmarksvfs(dest_repo)
+ dstbookmarks = dst_book_vfs.join(b'bookmarks')
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))
+ src_repo.ui.debug(msg % (len(entries) + bm_count))
with dest_repo.transaction(b"localclone") as tr:
dest_repo.store.write(tr)
To: marmoute, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210621/a3b4a662/attachment-0002.html>
More information about the Mercurial-patches
mailing list