This is an archive of the discontinued Mercurial Phabricator instance.

Differential D904

tweakdefaults: add abort flag for colon revset
ClosedPublic

Authored by ryanmce on Oct 2 2017, 7:28 AM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX471453577bd3: tweakdefaults: add abort flag for colon revset

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

ryanmce created this revision.Oct 2 2017, 7:28 AM
ryanmce updated this revision to Diff 2326.

fixup check-code

quark accepted this revision.Oct 2 2017, 1:02 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/tweakdefaults.py
716

nit: no need to use '%s' %.

This revision is now accepted and ready to land.Oct 2 2017, 1:02 PM
ryanmce added inline comments.Oct 2 2017, 1:19 PM
hgext3rd/tweakdefaults.py
716

Force of habit from my printf days I guess.

Closed by commit rFBHGX471453577bd3: tweakdefaults: add abort flag for colon revset (authored by ryanmce). · Explain WhyOct 3 2017, 5:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2326

hgext3rd/tweakdefaults.py

allowfullrepohistgrep = False allowfullrepohistgrep = False
allowmerge = True allowmerge = True
allowrollback = True allowrollback = True
allowtags = True allowtags = True
# change rebase exit from 1 to 0 if nothing is rebased # change rebase exit from 1 to 0 if nothing is rebased
nooprebase = True nooprebase = True
# whether to show a warning on some deprecated usages # whether to show a warning or abort on some deprecated usages
singlecolonwarn = False singlecolonwarn = False
singlecolonabort = False
# educational messages # educational messages
bmnodesthint = '' bmnodesthint = ''
bmnodestmsg = '' bmnodestmsg = ''
branchmessage = '' branchmessage = ''
branchesmessage = '' branchesmessage = ''
mergemessage = '' mergemessage = ''
nodesthint = '' nodesthint = ''
with repo.ui.configoverride(overrides, 'tweakdefaults'): with repo.ui.configoverride(overrides, 'tweakdefaults'):
return origcmd(*args, **kwargs) return origcmd(*args, **kwargs)
return cmd return cmd
def _analyzewrapper(orig, x, ui): def _analyzewrapper(orig, x, ui):
"""Wraps analyzer to detect the use of colons in the revisions""" """Wraps analyzer to detect the use of colons in the revisions"""
result = orig(x) result = orig(x)
enabled = ui.configbool('tweakdefaults', 'singlecolonwarn') warn = ui.configbool('tweakdefaults', 'singlecolonwarn')
abort = ui.configbool('tweakdefaults', 'singlecolonabort')
enabled = warn or abort
# The last condition is added so that warnings are not shown if # The last condition is added so that warnings are not shown if
# hg log --follow is invoked w/o arguments # hg log --follow is invoked w/o arguments
if enabled and isinstance(x, tuple) and \ if enabled and isinstance(x, tuple) and \
(x[0] in ('range', 'rangepre', 'rangepost')) and \ (x[0] in ('range', 'rangepre', 'rangepost')) and \
x != ('rangepre', ('symbol', '.')): x != ('rangepre', ('symbol', '.')):
msg = ui.config('tweakdefaults', 'singlecolonmsg', msg = ui.config('tweakdefaults', 'singlecolonmsg',
_("warning: use of ':' is deprecated")) _("use of ':' is deprecated"))
ui.warn('%s\n' % msg) if abort:
raise error.Abort('%s' % msg)
quarkUnsubmitted
Not Done

nit: no need to use '%s' %.

quark: nit: no need to use `'%s' %`.
ryanmceAuthorUnsubmitted
Not Done

Force of habit from my printf days I guess.

ryanmce: Force of habit from my printf days I guess.
if warn:
ui.warn(_('warning: %s\n') % msg)
return result return result
def _rebase(orig, ui, repo, **opts): def _rebase(orig, ui, repo, **opts):
if not opts.get('date') and not ui.configbool('tweakdefaults', if not opts.get('date') and not ui.configbool('tweakdefaults',
'rebasekeepdate'): 'rebasekeepdate'):
opts['date'] = currentdate() opts['date'] = currentdate()

tests/test-tweakdefaults-revsets.t

0 1 2 (no-eol) 0 1 2 (no-eol)
In this testcase warning should not be shown In this testcase warning should not be shown
$ hg log -T '{rev} ' -r ':' --config tweakdefaults.singlecolonwarn=1 $ hg log -T '{rev} ' -r ':' --config tweakdefaults.singlecolonwarn=1
0 1 2 (no-eol) 0 1 2 (no-eol)
Check that the custom message can be used Check that the custom message can be used
$ hg log -T '{rev} ' -r '0:' --config tweakdefaults.singlecolonwarn=1 --config tweakdefaults.singlecolonmsg="hey stop that" $ hg log -T '{rev} ' -r '0:' --config tweakdefaults.singlecolonwarn=1 --config tweakdefaults.singlecolonmsg="hey stop that"
hey stop that warning: hey stop that
0 1 2 (no-eol) 0 1 2 (no-eol)
Check that we can abort as well
$ hg log -T '{rev} ' -r '0:' --config tweakdefaults.singlecolonabort=1
abort: use of ':' is deprecated
[255]
$ hg log -T '{rev} ' -r '0:' --config tweakdefaults.singlecolonabort=1 --config tweakdefaults.singlecolonmsg="no more colons"
abort: no more colons
[255]