( )⚙ D1118 fbhistedit: removing the experimental config 'histeditng'

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1118

fbhistedit: removing the experimental config 'histeditng'
ClosedPublic

Authored by singhsrb on Oct 16 2017, 2:08 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX7837c8f58c2d: fbhistedit: removing the experimental config 'histeditng'
Summary

The config 'histeditng' was removed in upstream recently and is
therefore, no longer required. This commit removes the config and fixes some
tests which were dependent on it.

Test Plan

Ran all the tests.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Oct 16 2017, 2:08 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 16 2017, 2:08 PM
quark accepted this revision.Oct 16 2017, 5:45 PM
This revision is now accepted and ready to land.Oct 16 2017, 5:45 PM

Revision Contents
Changeset List

Diff 2828

hgext3rd/fbhistedit.py

extensions.find('histedit') extensions.find('histedit')
except KeyError: except KeyError:
raise error.Abort( raise error.Abort(
_('fbhistedit: please enable histedit extension as well')) _('fbhistedit: please enable histedit extension as well'))
defineactions() defineactions()
_extend_histedit(ui) _extend_histedit(ui)
if ui.config('experimental', 'histeditng'):
rebase = extensions.find('rebase') rebase = extensions.find('rebase')
extensions.wrapcommand(rebase.cmdtable, 'rebase', _rebase, extensions.wrapcommand(rebase.cmdtable, 'rebase', _rebase, synopsis='[-i]')
synopsis=' [-i]')
aliases, entry = cmdutil.findcmd('rebase', rebase.cmdtable) aliases, entry = cmdutil.findcmd('rebase', rebase.cmdtable)
newentry = list(entry) newentry = list(entry)
options = newentry[1] options = newentry[1]
# dirty hack because we need to change an existing switch # dirty hack because we need to change an existing switch
for idx, opt in enumerate(options): for idx, opt in enumerate(options):
if opt[0] == 'i': if opt[0] == 'i':
del options[idx] del options[idx]
options.append(('i', 'interactive', False, 'interactive rebase')) options.append(('i', 'interactive', False, 'interactive rebase'))
rebase.cmdtable['rebase'] = tuple(newentry) rebase.cmdtable['rebase'] = tuple(newentry)
def _extend_histedit(ui): def _extend_histedit(ui):
histedit = extensions.find('histedit') histedit = extensions.find('histedit')
_aliases, entry = cmdutil.findcmd('histedit', histedit.cmdtable) _aliases, entry = cmdutil.findcmd('histedit', histedit.cmdtable)
options = entry[1] options = entry[1]
options.append(('x', 'retry', False, options.append(('x', 'retry', False,
_('retry exec command that failed and try to continue'))) _('retry exec command that failed and try to continue')))
options.append(('', 'show-plan', False, _('show remaining actions list'))) options.append(('', 'show-plan', False, _('show remaining actions list')))

tests/test-fbhistedit-exec-obsolete.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit=
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit=
> rebase=
> EOF > EOF
Enable obsolete Enable obsolete
$ cat > ${TESTTMP}/obs.py << EOF $ cat > ${TESTTMP}/obs.py << EOF
> import mercurial.obsolete > import mercurial.obsolete
> mercurial.obsolete._enabled = True > mercurial.obsolete._enabled = True
> EOF > EOF

tests/test-fbhistedit-exec.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit=
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit=
> rebase=
> EOF > EOF
$ initrepo () $ initrepo ()
> { > {
> hg init r > hg init r
> cd r > cd r
> for x in a b c d e f ; do > for x in a b c d e f ; do
> echo $x > $x > echo $x > $x

tests/test-fbhistedit-rebase-interactive.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [experimental]
> histeditng=True
> [extensions] > [extensions]
> rebase=
> histedit=
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit=
> rebase=
> EOF > EOF
$ initrepo () $ initrepo ()
> { > {
> hg init r > hg init r
> cd r > cd r
> for x in a b c d e f ; do > for x in a b c d e f ; do
> echo $x > $x > echo $x > $x

tests/test-fbhistedit-show-plan.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit=
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit=
> rebase=
> EOF > EOF
$ initrepo () $ initrepo ()
> { > {
> hg init r > hg init r
> cd r > cd r
> for x in a b c d e f ; do > for x in a b c d e f ; do
> echo $x > $x > echo $x > $x

tests/test-fbhistedit-stop-obsolete.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit=
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py > fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit=
> rebase=
> EOF > EOF
Enable obsolete Enable obsolete
$ cat > ${TESTTMP}/obs.py << EOF $ cat > ${TESTTMP}/obs.py << EOF
> import mercurial.obsolete > import mercurial.obsolete
> mercurial.obsolete._enabled = True > mercurial.obsolete._enabled = True
> EOF > EOF

tests/test-morestatus.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [morestatus] > [morestatus]
> show=True > show=True
> [extensions] > [extensions]
> morestatus=$TESTDIR/../hgext3rd/morestatus.py > morestatus=$TESTDIR/../hgext3rd/morestatus.py
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> histedit= > histedit=
> rebase=
> reset=$TESTDIR/../hgext3rd/reset.py > reset=$TESTDIR/../hgext3rd/reset.py
> fbhistedit=$TESTDIR/../hgext3rd/fbhistedit.py
> EOF > EOF
$ cat >> $TESTTMP/breakupdate.py << EOF $ cat >> $TESTTMP/breakupdate.py << EOF
> import sys > import sys
> from mercurial import merge > from mercurial import merge
> def extsetup(ui): > def extsetup(ui):
> merge.applyupdates = lambda *args, **kwargs: sys.exit() > merge.applyupdates = lambda *args, **kwargs: sys.exit()
> EOF > EOF
$ breakupdateflag="--config extensions.breakupdate=$TESTTMP/breakupdate.py" $ breakupdateflag="--config extensions.breakupdate=$TESTTMP/breakupdate.py"