This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1014

revset: update repo._pinnedrevs with hidden commits from the tree
AbandonedPublic

Authored by pulkit on Oct 11 2017, 3:11 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This patch adds functionality to update the pinnedrevs set with the hidden
commits whose hashes are passed if the command allow accessing them and showing
warning depending on repo.filtername which is set by the type of command.

The logic to check whether a symbol is hash and logic related to showing
warning to user is imported from directacess extension from fb-hgext.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 11 2017, 3:11 PM
pulkit abandoned this revision.Oct 17 2017, 8:21 AM

Resend the series as D1140 - D1144.

Revision Contents
Changeset List

Diff 2597

mercurial/revset.py

if localalias: if localalias:
aliases.extend(localalias.items()) aliases.extend(localalias.items())
if aliases: if aliases:
tree = revsetlang.expandaliases(tree, aliases, warn=warn) tree = revsetlang.expandaliases(tree, aliases, warn=warn)
tree = revsetlang.foldconcat(tree) tree = revsetlang.foldconcat(tree)
tree = revsetlang.analyze(tree) tree = revsetlang.analyze(tree)
tree = revsetlang.optimize(tree) tree = revsetlang.optimize(tree)
posttreebuilthook(tree, repo) posttreebuilthook(tree, repo)
# add commits to pinned revs if hashes of hidden revs is passed and
# accessing hidden commmits is allowed
if repo and repo.filtername in ['visible-hidden', 'visible-warnhidden']:
_updatepinnedrevs(tree, repo)
return makematcher(tree) return makematcher(tree)
def makematcher(tree): def makematcher(tree):
"""Create a matcher from an evaluatable tree""" """Create a matcher from an evaluatable tree"""
def mfunc(repo, subset=None, order=None): def mfunc(repo, subset=None, order=None):
if order is None: if order is None:
if subset is None: if subset is None:
order = defineorder # 'x' order = defineorder # 'x'
if func._safe: if func._safe:
safesymbols.add(name) safesymbols.add(name)
# load built-in predicates explicitly to setup safesymbols # load built-in predicates explicitly to setup safesymbols
loadpredicate(None, None, predicate) loadpredicate(None, None, predicate)
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = symbols.values() i18nfunctions = symbols.values()
hashre = util.re.compile('[0-9a-fA-F]{1,40}')
_listtuple = ('symbol', '_list')
def _ishashsymbol(symbol, maxrev):
""" returns true if symbol looks like a hash """
try:
n = int(symbol)
if n <= maxrev:
# It's a rev number
return False
except ValueError:
pass
return hashre.match(symbol)
def gethashsymbols(tree, maxrev):
""" returns the list of symbols of the tree that look like hashes
for example for the revset 3::abe3ff it will return ('abe3ff') """
if not tree:
return []
results = []
if len(tree) in (2, 3) and tree[0] == "symbol":
results.append(tree[1])
elif tree[0] == "func" and tree[1] == _listtuple:
# the optimiser will group sequence of hash request
results += tree[2][1].split('\0')
elif len(tree) >= 2:
for subtree in tree[1:]:
results += gethashsymbols(subtree, maxrev)
# return directly, we don't need to filter symbols again
return results
return [s for s in results if _ishashsymbol(s, maxrev)]
def _updatepinnedrevs(tree, repo):
""" extracts the symbols that looks like hashes and add them to
repo._pinnedrevs for accessing hidden hashes
"""
hiddenset = set()
cl = repo.unfiltered().changelog
symbols = gethashsymbols(tree, len(cl))
for revnode in symbols:
try:
revnode = cl._partialmatch(revnode)
except error.LookupError:
revnode = None
if revnode is not None:
rev = cl.rev(revnode)
if rev not in repo.changelog:
hiddenset.add(rev)
if hiddenset:
if repo.filtername == 'visible-warnhidden':
repo.ui.warn(_("warning: accessing hidden changesets %s "
"for write operation\n") %
(",".join([str(repo.unfiltered()[l])
for l in hiddenset])))
repo._pinnedrevs.update(hiddenset)
repo.invalidatevolatilesets()