This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9198

sidedata: return enough data to set the proper flag in the future
ClosedPublic

Authored by marmoute on Oct 13 2020, 6:40 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG53c265a6fc83: sidedata: return enough data to set the proper flag in the future
Summary

If the revision has information relevant to copy tracing, we need to set a
dedicated flag in revlog. Currently the upgrade process is failing to do so.
Before we teach the upgrade process about flags, we make the information
available where we will needs it.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/metadata.py (11 lines)

Diff 23244

mercurial/metadata.py

copied(all_files[copy_idx], filename) copied(all_files[copy_idx], filename)
return md return md
def _getsidedata(srcrepo, rev): def _getsidedata(srcrepo, rev):
ctx = srcrepo[rev] ctx = srcrepo[rev]
files = compute_all_files_changes(ctx) files = compute_all_files_changes(ctx)
return encode_files_sidedata(files) return encode_files_sidedata(files), files.has_copies_info
def getsidedataadder(srcrepo, destrepo): def getsidedataadder(srcrepo, destrepo):
use_w = srcrepo.ui.configbool(b'experimental', b'worker.repository-upgrade') use_w = srcrepo.ui.configbool(b'experimental', b'worker.repository-upgrade')
if pycompat.iswindows or not use_w: if pycompat.iswindows or not use_w:
return _get_simple_sidedata_adder(srcrepo, destrepo) return _get_simple_sidedata_adder(srcrepo, destrepo)
else: else:
return _get_worker_sidedata_adder(srcrepo, destrepo) return _get_worker_sidedata_adder(srcrepo, destrepo)
w.start() w.start()
# dictionnary to store results for revision higher than we one we are # dictionnary to store results for revision higher than we one we are
# looking for. For example, if we need the sidedatamap for 42, and 43 is # looking for. For example, if we need the sidedatamap for 42, and 43 is
# received, when shelve 43 for later use. # received, when shelve 43 for later use.
staging = {} staging = {}
def sidedata_companion(revlog, rev): def sidedata_companion(revlog, rev):
sidedata = {} data = {}, False
if util.safehasattr(revlog, b'filteredrevs'): # this is a changelog if util.safehasattr(revlog, b'filteredrevs'): # this is a changelog
# Is the data previously shelved ? # Is the data previously shelved ?
sidedata = staging.pop(rev, None) sidedata = staging.pop(rev, None)
if sidedata is None: if sidedata is None:
# look at the queued result until we find the one we are lookig # look at the queued result until we find the one we are lookig
# for (shelve the other ones) # for (shelve the other ones)
r, sidedata = sidedataq.get() r, data = sidedataq.get()
while r != rev: while r != rev:
staging[r] = sidedata staging[r] = data
r, sidedata = sidedataq.get() r, sidedata = sidedataq.get()
tokens.release() tokens.release()
sidedataq, has_copies_info = data
return False, (), sidedata return False, (), sidedata
return sidedata_companion return sidedata_companion
def _get_simple_sidedata_adder(srcrepo, destrepo): def _get_simple_sidedata_adder(srcrepo, destrepo):
"""The simple version of the sidedata computation """The simple version of the sidedata computation
It just compute it in the same thread on request""" It just compute it in the same thread on request"""
def sidedatacompanion(revlog, rev): def sidedatacompanion(revlog, rev):
sidedata = {} sidedata = {}
if util.safehasattr(revlog, 'filteredrevs'): # this is a changelog if util.safehasattr(revlog, 'filteredrevs'): # this is a changelog
sidedata = _getsidedata(srcrepo, rev) sidedata, has_copies_info = _getsidedata(srcrepo, rev)
return False, (), sidedata return False, (), sidedata
return sidedatacompanion return sidedatacompanion
def getsidedataremover(srcrepo, destrepo): def getsidedataremover(srcrepo, destrepo):
def sidedatacompanion(revlog, rev): def sidedatacompanion(revlog, rev):
f = () f = ()