This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5252

share: avoid a now-unnecessary reload of the repo
ClosedPublic

Authored by martinvonz on Nov 9 2018, 2:28 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG85bf93def065: share: avoid a now-unnecessary reload of the repo
Summary

hg.share() now returns an already-reloaded repo, so let's just use
that. (This would have failed test-subrepo-recursion.t without the
previous patch.)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 9 2018, 2:28 PM
Closed by commit rHG85bf93def065: share: avoid a now-unnecessary reload of the repo (authored by martinvonz). · Explain WhyNov 9 2018, 9:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (5 lines)

Diff 12499

mercurial/hg.py

# Resolve the value to put in [paths] section for the source. # Resolve the value to put in [paths] section for the source.
if islocal(source): if islocal(source):
defaultpath = os.path.abspath(util.urllocalpath(source)) defaultpath = os.path.abspath(util.urllocalpath(source))
else: else:
defaultpath = source defaultpath = source
sharerepo = repository(ui, path=sharepath) sharerepo = repository(ui, path=sharepath)
share(ui, sharerepo, dest=dest, update=False, bookmarks=False, destrepo = share(ui, sharerepo, dest=dest, update=False, bookmarks=False,
defaultpath=defaultpath) defaultpath=defaultpath)
# We need to perform a pull against the dest repo to fetch bookmarks # We need to perform a pull against the dest repo to fetch bookmarks
# and other non-store data that isn't shared by default. In the case of # and other non-store data that isn't shared by default. In the case of
# non-existing shared repo, this means we pull from the remote twice. This # non-existing shared repo, this means we pull from the remote twice. This
# is a bit weird. But at the time it was implemented, there wasn't an easy # is a bit weird. But at the time it was implemented, there wasn't an easy
# way to pull just non-changegroup data. # way to pull just non-changegroup data.
destrepo = repository(ui, path=dest)
exchange.pull(destrepo, srcpeer, heads=revs) exchange.pull(destrepo, srcpeer, heads=revs)
_postshareupdate(destrepo, update) _postshareupdate(destrepo, update)
return srcpeer, peer(ui, peeropts, dest) return srcpeer, peer(ui, peeropts, dest)
# Recomputing branch cache might be slow on big repos, # Recomputing branch cache might be slow on big repos,
# so just copy it # so just copy it