( )⚙ D1209 config: rename allowdivergence to evolution.allowdivergence

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1209

config: rename allowdivergence to evolution.allowdivergence
ClosedPublic

Authored by durham on Oct 23 2017, 3:23 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX9e9486ade9dd: config: rename allowdivergence to evolution.allowdivergence
Summary

Upstream has renamed this config. Since the old config name was still an alias
for the new name, it was technically only breaking the test output where we
hardcoded the config name in the output. But I went ahead and updated every
place anyways.

Diff Detail

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

Event Timeline

durham created this revision.Oct 23 2017, 3:23 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 23 2017, 3:23 PM
quark accepted this revision.Oct 23 2017, 4:50 PM
This revision is now accepted and ready to land.Oct 23 2017, 4:50 PM
Closed by commit rFBHGX9e9486ade9dd: config: rename allowdivergence to evolution.allowdivergence (authored by durham). · Explain WhyOct 25 2017, 8:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3058

hgext3rd/tweakdefaults.py

del res[key] del res[key]
return res return res
def _checkobsrebasewrapper(orig, repo, ui, *args): def _checkobsrebasewrapper(orig, repo, ui, *args):
overrides = {} overrides = {}
try: try:
extensions.find('inhibit') extensions.find('inhibit')
# if inhibit is enabled, allow divergence # if inhibit is enabled, allow divergence
overrides[('experimental', 'allowdivergence')] = True overrides[('experimental', 'evolution.allowdivergence')] = True
except KeyError: except KeyError:
pass pass
with repo.ui.configoverride(overrides, 'tweakdefaults'): with repo.ui.configoverride(overrides, 'tweakdefaults'):
orig(repo, ui, *args) orig(repo, ui, *args)
def currentdate(): def currentdate():
return "%d %d" % util.makedate(time.time()) return "%d %d" % util.makedate(time.time())

tests/test-fbamend-restack.t

Set up test environment. Set up test environment.
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> drawdag=$RUNTESTDIR/drawdag.py > drawdag=$RUNTESTDIR/drawdag.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> rebase= > rebase=
> [experimental] > [experimental]
> allowdivergence = True > evolution.allowdivergence = True
> evolution = createmarkers, allowunstable > evolution = createmarkers, allowunstable
> [fbamend] > [fbamend]
> # do not write preamend bookmarks > # do not write preamend bookmarks
> userestack = True > userestack = True
> EOF > EOF
$ mkcommit() { $ mkcommit() {
> echo "$1" > "$1" > echo "$1" > "$1"
> hg add "$1" > hg add "$1"

tests/test-smartlog-obsolete.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> histedit= > histedit=
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> rebase= > rebase=
> smartlog=$TESTDIR/../hgext3rd/smartlog.py > smartlog=$TESTDIR/../hgext3rd/smartlog.py
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> [tweakdefaults] > [tweakdefaults]
> histeditkeepdate = true > histeditkeepdate = true
> [experimental] > [experimental]
> evolution = createmarkers, allowunstable > evolution = createmarkers, allowunstable
> allowdivergence = on > evolution.allowdivergence = on
> [ui] > [ui]
> interactive = true > interactive = true
> EOF > EOF
$ mkcommit() { $ mkcommit() {
> echo $1 > $1 > echo $1 > $1
> hg add $1 > hg add $1
> hg ci -m "add $1" > hg ci -m "add $1"
> } > }

tests/test-smartlog-tweakdefaults.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> rebase= > rebase=
> smartlog=$TESTDIR/../hgext3rd/smartlog.py > smartlog=$TESTDIR/../hgext3rd/smartlog.py
> tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py > tweakdefaults=$TESTDIR/../hgext3rd/tweakdefaults.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> allowdivergence=on > evolution.allowdivergence=on
> EOF > EOF
Prepare a repo for amend checks Prepare a repo for amend checks
$ hg init repo $ hg init repo
$ cd repo $ cd repo
$ echo root > root && hg ci -Am root # rev 0 $ echo root > root && hg ci -Am root # rev 0
adding root adding root
$ echo base > base && hg ci -Am base # rev 1 $ echo base > base && hg ci -Am base # rev 1

tests/test-tweakdefaults.t

Prepare a repo for testing divergence warnings with respect to inhibit extension Prepare a repo for testing divergence warnings with respect to inhibit extension
and allowance of prune rebases and allowance of prune rebases
$ hg init repodiv && cd repodiv $ hg init repodiv && cd repodiv
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [experimental] > [experimental]
> evolution=createmarkers > evolution=createmarkers
> prunestrip=on > prunestrip=on
> allowdivergence=off > evolution.allowdivergence=off
> [extensions] > [extensions]
> strip= > strip=
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> EOF > EOF
$ echo root > root && hg ci -Am root # rev 0 $ echo root > root && hg ci -Am root # rev 0
adding root adding root
$ echo a > a && hg ci -Am a # rev 1 $ echo a > a && hg ci -Am a # rev 1
adding a adding a
adding d adding d
created new head created new head
$ hg rebase -r 1 -d 2 $ hg rebase -r 1 -d 2
rebasing 1:09d39afb522a "a" rebasing 1:09d39afb522a "a"
Test that we show divergence warning if inhibit is disabled Test that we show divergence warning if inhibit is disabled
$ hg rebase -r 1 -d 3 --hidden $ hg rebase -r 1 -d 3 --hidden
abort: this rebase will cause divergences from: 09d39afb522a abort: this rebase will cause divergences from: 09d39afb522a
(to force the rebase please set experimental.allowdivergence=True) (to force the rebase please set experimental.evolution.allowdivergence=True)
[255] [255]
Test that we do not show divergence warning if inhibit is enabled Test that we do not show divergence warning if inhibit is enabled
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> EOF > EOF
$ hg rebase -r 1 -d 3 --hidden $ hg rebase -r 1 -d 3 --hidden
rebasing 1:09d39afb522a "a" rebasing 1:09d39afb522a "a"