( )⚙ D1275 pushvars: move config setting in tweakdefaults and drop the extension

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1275

pushvars: move config setting in tweakdefaults and drop the extension
ClosedPublic

Authored by pulkit on Oct 31 2017, 2:40 PM.
Tags
None
Subscribers
None

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGX6b87b3056016: pushvars: move config setting in tweakdefaults and drop the extension
Summary

The logic of pushvars extension was moved to core and the extension here just
used to set a config which defaults to False in core. Let's move that config
setting to tweakdefaults and drop the extension.

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.

Event Timeline

pulkit created this revision.Oct 31 2017, 2:40 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 31 2017, 2:40 PM
durham accepted this revision.Oct 31 2017, 4:11 PM
This revision is now accepted and ready to land.Oct 31 2017, 4:11 PM
Closed by commit rFBHGX6b87b3056016: pushvars: move config setting in tweakdefaults and drop the extension (authored by pulkit). · Explain WhyOct 31 2017, 4:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3182

hgext3rd/pushvars.py

  • This file was deleted.
# pushvars.py -- extension for setting environment variables on the server-side
# during pushes.
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
def reposetup(ui, repo):
"""
The main pushvars functionality moved into core hg. However, the behavior
of the core version differs from this extension, which originally would
set the environment variables on the server by default when the extension
was enabled. To keep that behavior, this extension now just sets the option.
This makes the transition painless.
"""
repo.ui.setconfig('push', 'pushvars.server', True)

hgext3rd/tweakdefaults.py

# Tweak Behavior # Tweak Behavior
tweakbehaviors(ui) tweakbehaviors(ui)
_fixpager(ui) _fixpager(ui)
def reposetup(ui, repo): def reposetup(ui, repo):
_fixpager(ui) _fixpager(ui)
# Allow uncommit on dirty working directory # Allow uncommit on dirty working directory
repo.ui.setconfig('experimental', 'uncommitondirtywdir', True) repo.ui.setconfig('experimental', 'uncommitondirtywdir', True)
# Allow unbundling of pushvars on server
repo.ui.setconfig('push', 'pushvars.server', True)
def tweakorder(): def tweakorder():
""" """
Tweakdefaults generally should load first; other extensions may modify Tweakdefaults generally should load first; other extensions may modify
behavior such that tweakdefaults will be happy, so we should not prevent behavior such that tweakdefaults will be happy, so we should not prevent
that from happening too early in the process. Note that by loading first, that from happening too early in the process. Note that by loading first,
we ensure that tweakdefaults's function wrappers run *last*. we ensure that tweakdefaults's function wrappers run *last*.

tests/test-pushvars-remotenames.t

$ . $TESTDIR/require-ext.sh remotenames $ . $TESTDIR/require-ext.sh remotenames
Setup Setup
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ cat > $TESTTMP/pretxnchangegroup.sh << EOF $ cat > $TESTTMP/pretxnchangegroup.sh << EOF
> #!/bin/sh > #!/bin/sh
> env | grep -E "^HG_USERVAR" > env | grep -E "^HG_USERVAR"
> exit 0 > exit 0
> EOF > EOF
$ chmod +x $TESTTMP/pretxnchangegroup.sh $ chmod +x $TESTTMP/pretxnchangegroup.sh
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> pushvars=$TESTDIR/../hgext3rd/pushvars.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> remotenames= > remotenames=
> [hooks] > [hooks]
> pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh > pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
> EOF > EOF
$ hg init server $ hg init server
$ cd server $ cd server

tests/test-pushvars.t

  • This file was deleted.
Setup
$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH
$ cat > $TESTTMP/pretxnchangegroup.sh << EOF
> #!/bin/sh
> env | grep -E "^HG_USERVAR_DEBUG"
> env | grep -E "^HG_USERVAR_BYPASS_REVIEW"
> exit 0
> EOF
$ chmod +x $TESTTMP/pretxnchangegroup.sh
$ cat >> $HGRCPATH << EOF
> [extensions]
> pushvars=$TESTDIR/../hgext3rd/pushvars.py
> [hooks]
> pretxnchangegroup = $TESTTMP/pretxnchangegroup.sh
> [experimental]
> bundle2-exp = true
> EOF
$ hg init repo
$ hg clone -q repo child
$ cd child
Test pushing vars to repo
$ echo b > a
$ hg commit -Aqm a
$ hg push --pushvars "DEBUG=1" --pushvars "BYPASS_REVIEW=true"
pushing to $TESTTMP/repo (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
HG_USERVAR_DEBUG=1
HG_USERVAR_BYPASS_REVIEW=true
Test pushing var with empty right-hand side
$ echo b >> a
$ hg commit -Aqm a
$ hg push --pushvars "DEBUG="
pushing to $TESTTMP/repo (glob)
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
HG_USERVAR_DEBUG=
Test pushing bad vars
$ echo b >> a
$ hg commit -Aqm b
$ hg push --pushvars "DEBUG"
pushing to $TESTTMP/repo (glob)
searching for changes
abort: unable to parse variable 'DEBUG', should follow 'KEY=VALUE' or 'KEY=' format
[255]
tests/test-pushvars-remotenames.t