This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1733

scmutil: add utility fn to return repo object with user passed revs unhidden
ClosedPublic

Authored by pulkit on Dec 19 2017, 7:10 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG8bb90cc4668e: scmutil: add utility fn to return repo object with user passed revs unhidden
Summary

There has been a need for accessing hidden changesets by default without passing
--hidden. This is currently done using the directaccess extension but is bit
hacky.

This patch adds a utility function to return a repo object having user passed
revisions unhidden. This functionality will live behind a
config option and won't be the default behaviour. There is also a config option
added by this patch which tells whether we want to unhide only those revisions
whose hashes are passed or should we consider revisions numbers also.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Dec 19 2017, 7:10 AM
yuja requested changes to this revision.Dec 19 2017, 9:18 AM
yuja added a subscriber: yuja.

Other than that, this one looks good.

mercurial/scmutil.py
1345

If visible- is required, we should probably check the filtername
of the source repo.

1346

And I slightly prefer a single function call that creates new filtered
repository with the given "exception" revs.

Otherwise, we might have to be careful to not keep a stale cache
that gets invalid on addvisibilityexceptions(revs).

This revision now requires changes to proceed.Dec 19 2017, 9:18 AM
pulkit added inline comments.Dec 22 2017, 8:03 AM
mercurial/scmutil.py
1345

Sorry I don't get you. Check the filtername of the source repo for what?

yuja added inline comments.Dec 22 2017, 8:52 AM
mercurial/scmutil.py
1345
repo = repo.filtered('served')
repo = unhidehashlikerevs(repo, ...)
repo.filtername == 'visible-hidden'

Does it make sense?

pulkit updated this revision to Diff 4585.Dec 22 2017, 12:57 PM
yuja accepted this revision.Dec 26 2017, 8:43 AM
This revision is now accepted and ready to land.Dec 26 2017, 8:43 AM
yuja added inline comments.Dec 26 2017, 8:51 AM
mercurial/scmutil.py
1322

It seems better to use an explicit list of filternames,
i.e. ('visible', 'visible-hidden'). I don't think we should introduce
new naming scheme, 'visible<x>'.

Can you send a followup?

Closed by commit rHG8bb90cc4668e: scmutil: add utility fn to return repo object with user passed revs unhidden (authored by pulkit). · Explain WhyDec 26 2017, 9:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (6 lines)
Mmercurial/scmutil.py (76 lines)

Diff 4585

mercurial/configitems.py

default=100, default=100,
) )
coreconfigitem('experimental', 'copytrace.sourcecommitlimit', coreconfigitem('experimental', 'copytrace.sourcecommitlimit',
default=100, default=100,
) )
coreconfigitem('experimental', 'crecordtest', coreconfigitem('experimental', 'crecordtest',
default=None, default=None,
) )
coreconfigitem('experimental', 'directaccess',
default=False,
)
coreconfigitem('experimental', 'directaccess.revnums',
default=False,
)
coreconfigitem('experimental', 'editortmpinhg', coreconfigitem('experimental', 'editortmpinhg',
default=False, default=False,
) )
coreconfigitem('experimental', 'evolution', coreconfigitem('experimental', 'evolution',
default=list, default=list,
) )
coreconfigitem('experimental', 'evolution.allowdivergence', coreconfigitem('experimental', 'evolution.allowdivergence',
default=False, default=False,

mercurial/scmutil.py

hint %= (len(heads), nodesummaries(repo, heads)) hint %= (len(heads), nodesummaries(repo, heads))
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
def wrapconvertsink(sink): def wrapconvertsink(sink):
"""Allow extensions to wrap the sink returned by convcmd.convertsink() """Allow extensions to wrap the sink returned by convcmd.convertsink()
before it is used, whether or not the convert extension was formally loaded. before it is used, whether or not the convert extension was formally loaded.
""" """
return sink return sink
def unhidehashlikerevs(repo, specs, hiddentype):
"""parse the user specs and unhide changesets whose hash or revision number
is passed.
hiddentype can be: 1) 'warn': warn while unhiding changesets
2) 'nowarn': don't warn while unhiding changesets
returns a repo object with the required changesets unhidden
"""
if not repo.filtername or not repo.ui.configbool('experimental',
'directaccess'):
return repo
if not repo.filtername.startswith('visible'):
yujaUnsubmitted
Not Done

It seems better to use an explicit list of filternames,
i.e. ('visible', 'visible-hidden'). I don't think we should introduce
new naming scheme, 'visible<x>'.

Can you send a followup?

yuja: It seems better to use an explicit list of filternames, i.e. `('visible', 'visible-hidden')`. I…
return repo
symbols = set()
for spec in specs:
try:
tree = revsetlang.parse(spec)
except error.ParseError: # will be reported by scmutil.revrange()
continue
symbols.update(revsetlang.gethashlikesymbols(tree))
if not symbols:
return repo
revs = _getrevsfromsymbols(repo, symbols)
if not revs:
return repo
if hiddentype == 'warn':
unfi = repo.unfiltered()
revstr = _(",").join([pycompat.bytestr(unfi[l]) for l in revs])
repo.ui.warn(_("warning: accessing hidden changesets for write "
yujaUnsubmitted
Not Done

If visible- is required, we should probably check the filtername
of the source repo.

yuja: If `visible-` is required, we should probably check the filtername of the source repo.
pulkitAuthorUnsubmitted
Not Done

Sorry I don't get you. Check the filtername of the source repo for what?

pulkit: Sorry I don't get you. Check the filtername of the source repo for what?
yujaUnsubmitted
Not Done
repo = repo.filtered('served')
repo = unhidehashlikerevs(repo, ...)
repo.filtername == 'visible-hidden'

Does it make sense?

yuja: ``` repo = repo.filtered('served') repo = unhidehashlikerevs(repo, ...) repo.filtername ==…
"operation: %s\n") % revstr)
yujaUnsubmitted
Not Done

And I slightly prefer a single function call that creates new filtered
repository with the given "exception" revs.

Otherwise, we might have to be careful to not keep a stale cache
that gets invalid on addvisibilityexceptions(revs).

yuja: And I slightly prefer a single function call that creates new filtered repository with the…
return repo.filtered('visible-hidden', revs)
def _getrevsfromsymbols(repo, symbols):
"""parse the list of symbols and returns a set of revision numbers of hidden
changesets present in symbols"""
revs = set()
unfi = repo.unfiltered()
unficl = unfi.changelog
cl = repo.changelog
tiprev = len(unficl)
pmatch = unficl._partialmatch
allowrevnums = repo.ui.configbool('experimental', 'directaccess.revnums')
for s in symbols:
try:
n = int(s)
if n <= tiprev:
if not allowrevnums:
continue
else:
if n not in cl:
revs.add(n)
continue
except ValueError:
pass
try:
s = pmatch(s)
except error.LookupError:
s = None
if s is not None:
rev = unficl.rev(s)
if rev not in cl:
revs.add(rev)
return revs