This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1827

scmutil: add warnmessage argument to unhidehashlikerevs function
AbandonedPublic

Authored by pulkit on Jan 6 2018, 1:48 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Summary

While adding support for unhiding revs for commands which are not just read
only, a need for showing custom messages for different command is found. This
patch adds a new optional argument to unhidehashlikerevs() function which if
passed will be the warning message displayed to user provided the function is
called in "warn" mode.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Jan 6 2018, 1:48 AM
yuja requested changes to this revision.Jan 10 2018, 7:52 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/scmutil.py
1350

_() must wrap a string literal.

FWIW, hiddentype == 'warn' might not be that useful. See the
comment on the next patch.

This revision now requires changes to proceed.Jan 10 2018, 7:52 AM
pulkit abandoned this revision.Mar 1 2018, 7:52 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (10 lines)

Diff 4731

mercurial/scmutil.py

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): def unhidehashlikerevs(repo, specs, hiddentype, warnmessage=None):
"""parse the user specs and unhide changesets whose hash or revision number """parse the user specs and unhide changesets whose hash or revision number
is passed. is passed.
hiddentype can be: 1) 'warn': warn while unhiding changesets hiddentype can be: 1) 'warn': warn while unhiding changesets
2) 'nowarn': don't warn while unhiding changesets 2) 'nowarn': don't warn while unhiding changesets
returns a repo object with the required changesets unhidden returns a repo object with the required changesets unhidden
""" """
revs = _getrevsfromsymbols(repo, symbols) revs = _getrevsfromsymbols(repo, symbols)
if not revs: if not revs:
return repo return repo
if hiddentype == 'warn': if hiddentype == 'warn':
unfi = repo.unfiltered() unfi = repo.unfiltered()
revstr = ", ".join([pycompat.bytestr(unfi[l]) for l in revs]) revstr = ", ".join([pycompat.bytestr(unfi[l]) for l in revs])
if warnmessage is None:
repo.ui.warn(_("warning: accessing hidden changesets for write " repo.ui.warn(_("warning: accessing hidden changesets for write "
"operation: %s\n") % revstr) "operation: %s\n") % revstr)
else:
warnmessage += " %s\n"
repo.ui.warn(_(warnmessage) % revstr)
yujaUnsubmitted
Not Done

_() must wrap a string literal.

FWIW, hiddentype == 'warn' might not be that useful. See the
comment on the next patch.

yuja: `_()` must wrap a string literal. FWIW, `hiddentype == 'warn'` might not be that useful. See…
# we have to use new filtername to separate branch/tags cache until we can # we have to use new filtername to separate branch/tags cache until we can
# disbale these cache when revisions are dynamically pinned. # disbale these cache when revisions are dynamically pinned.
return repo.filtered('visible-hidden', revs) return repo.filtered('visible-hidden', revs)
def _getrevsfromsymbols(repo, symbols): def _getrevsfromsymbols(repo, symbols):
"""parse the list of symbols and returns a set of revision numbers of hidden """parse the list of symbols and returns a set of revision numbers of hidden
changesets present in symbols""" changesets present in symbols"""