This is an archive of the discontinued Mercurial Phabricator instance.

Differential D802

tweakdefaults: add config to enable/disable developer warnings
ClosedPublic

Authored by singhsrb on Sep 22 2017, 6:28 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX6485464f8364: tweakdefaults: add config to enable/disable developer warnings
Summary

Adding a config to control (only enable/disable for now) developer
warnings. This allows disabling the warnings on platforms like servers.

Test Plan

Updated and ran test-tweakdefaults.t

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
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
Mhgext3rd/tweakdefaults.py (16 lines)
Mtests/test-tweakdefaults.t (41 lines)

Diff 2055

hgext3rd/tweakdefaults.py

mergemessage = '' mergemessage = ''
nodesthint = '' nodesthint = ''
nodestmsg = '' nodestmsg = ''
rollbackhint = '' rollbackhint = ''
tagsmessage = '' tagsmessage = ''
# output new hashes when nodes get updated # output new hashes when nodes get updated
showupdated = False showupdated = False
# Show developers warning for using discouraged features.
#
# For example, 'x:y' in revsets shows revision numbers between x and y,
# both inclusive. Usually, this doesn't correspond to any meaningful
# interpretation of the repo and is therefore, discouraged.
develwarn = True
""" """
from __future__ import absolute_import from __future__ import absolute_import
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
short, short,
) )
from mercurial import ( from mercurial import (
opawarerebase = markermetadatawritingcommand(ui, _rebase, 'rebase') opawarerebase = markermetadatawritingcommand(ui, _rebase, 'rebase')
wrapcommand(rebase.cmdtable, 'rebase', opawarerebase) wrapcommand(rebase.cmdtable, 'rebase', opawarerebase)
wrapfunction(scmutil, 'cleanupnodes', cleanupnodeswrapper) wrapfunction(scmutil, 'cleanupnodes', cleanupnodeswrapper)
entry = wrapcommand(commands.table, 'pull', pull) entry = wrapcommand(commands.table, 'pull', pull)
options = entry[1] options = entry[1]
options.append( options.append(
('d', 'dest', '', _('destination for rebase or update'))) ('d', 'dest', '', _('destination for rebase or update')))
if ui.configbool('tweakdefaults', 'develwarn', True):
# anonymous function to pass ui object to _analyzewrapper # anonymous function to pass ui object to _analyzewrapper
def _analyzewrap(orig, x): def _analyzewrap(orig, x):
return _analyzewrapper(orig, x, ui) return _analyzewrapper(orig, x, ui)
wrapfunction(revsetlang, '_analyze', _analyzewrap) wrapfunction(revsetlang, '_analyze', _analyzewrap)
try: try:
rebaseext = extensions.find('rebase') rebaseext = extensions.find('rebase')
# tweakdefaults is already loaded before other extensions # tweakdefaults is already loaded before other extensions
# (see tweakorder() function) so if these functions are wrapped # (see tweakorder() function) so if these functions are wrapped
# by something else, it's not a problem. # by something else, it's not a problem.
wrapfunction(rebaseext, '_computeobsoletenotrebased', wrapfunction(rebaseext, '_computeobsoletenotrebased',
_computeobsoletenotrebasedwrapper) _computeobsoletenotrebasedwrapper)
wrapfunction(rebaseext, '_checkobsrebase', wrapfunction(rebaseext, '_checkobsrebase',

tests/test-tweakdefaults.t

#testcases develwarn.true develwarn.false
$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> rebase= > rebase=
> histedit= > histedit=
> [experimental] > [experimental]
> updatecheck=noconflict > updatecheck=noconflict
> EOF > EOF
#if develwarn.false
$ cat >> $HGRCPATH << EOF
> [tweakdefaults]
> develwarn = False
> EOF
#endif
Setup repo Setup repo
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ touch a $ touch a
$ hg commit -Aqm a $ hg commit -Aqm a
$ mkdir dir $ mkdir dir
$ touch dir/b $ touch dir/b
o 2 o 2
| |
o 1 master o 1 master
| |
o 0 o 0
Test that developer warning is shown whenever ':' is used implicitly or explicitly Test that developer warning is shown whenever ':' is used implicitly or explicitly
#if develwarn.true
$ hg log -G -T '{rev} {bookmarks}' -r '0:2' $ hg log -G -T '{rev} {bookmarks}' -r '0:2'
devel-warn: use of ':' is deprecated devel-warn: use of ':' is deprecated
at: *tweakdefaults.py:* (_analyzewrap) (glob) at: *tweakdefaults.py:* (_analyzewrap) (glob)
o 2 o 2
| |
o 1 master o 1 master
| |
o 0 o 0
#else
$ hg log -G -T '{rev} {bookmarks}' -r '0:2'
o 2
|
o 1 master
|
o 0
#endif
#if develwarn.true
$ hg log -G -T '{rev} {bookmarks}' -r ':2' $ hg log -G -T '{rev} {bookmarks}' -r ':2'
devel-warn: use of ':' is deprecated devel-warn: use of ':' is deprecated
at: *tweakdefaults.py:* (_analyzewrap) (glob) at: *tweakdefaults.py:* (_analyzewrap) (glob)
o 2 o 2
| |
o 1 master o 1 master
| |
o 0 o 0
#else
$ hg log -G -T '{rev} {bookmarks}' -r ':2'
o 2
|
o 1 master
|
o 0
#endif
#if develwarn.true
$ hg log -G -T '{rev} {bookmarks}' -r '0:' $ hg log -G -T '{rev} {bookmarks}' -r '0:'
devel-warn: use of ':' is deprecated devel-warn: use of ':' is deprecated
at: *tweakdefaults.py:* (_analyzewrap) (glob) at: *tweakdefaults.py:* (_analyzewrap) (glob)
o 2 o 2
| |
o 1 master o 1 master
| |
o 0 o 0
#else
$ hg log -G -T '{rev} {bookmarks}' -r '0:'
o 2
|
o 1 master
|
o 0
#endif
In this testcase warning should not be shown In this testcase warning should not be shown
$ hg log -G -T '{rev} {bookmarks}' -r ':' $ hg log -G -T '{rev} {bookmarks}' -r ':'
o 2 o 2
| |
o 1 master o 1 master
| |
o 0 o 0