comparison tests/test-obsolete-push.t @ 4359:2cbb9914d227 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:54:43 -0500
parents b7b6a4524ef7
children a2fdbece7ce1 a1dad44fe3da
comparison
equal deleted inserted replaced
4312:108b08a16260 4359:2cbb9914d227
2 > [defaults] 2 > [defaults]
3 > amend=-d "0 0" 3 > amend=-d "0 0"
4 > [extensions] 4 > [extensions]
5 > EOF 5 > EOF
6 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 6 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
7 $ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH
7 8
8 $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' 9 $ template='{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n'
9 $ glog() { 10 $ glog() {
10 > hg log -G --template "$template" "$@" 11 > hg log -G --template "$template" "$@"
11 > } 12 > }
70 > auto-publish = abort 71 > auto-publish = abort
71 > eof 72 > eof
72 $ hg push -r . 73 $ hg push -r .
73 pushing to $TESTTMP/source 74 pushing to $TESTTMP/source
74 abort: push would publish 1 changesets 75 abort: push would publish 1 changesets
75 (behavior controlled by 'experimental.auto-publish' config) 76 (* 'experimental.auto-publish' config) (glob)
76 [255] 77 [255]
77 $ hg push 78 $ hg push
78 pushing to $TESTTMP/source 79 pushing to $TESTTMP/source
79 abort: push would publish 1 changesets 80 abort: push would publish 1 changesets
80 (behavior controlled by 'experimental.auto-publish' config) 81 (* 'experimental.auto-publish' config) (glob)
81 [255] 82 [255]
82 83
83 warning behavior 84 warning behavior
84 85
85 $ echo 'auto-publish = warn' >> .hg/hgrc 86 $ echo 'auto-publish = warn' >> .hg/hgrc
89 searching for changes 90 searching for changes
90 adding changesets 91 adding changesets
91 adding manifests 92 adding manifests
92 adding file changes 93 adding file changes
93 added 0 changesets with 0 changes to 1 files 94 added 0 changesets with 0 changes to 1 files
95
96 --publish overrides auto-publish
97
98 $ echo d > d
99 $ hg ci -qAm D d
100 $ hg push -r . --publish --config experimental.auto-publish=abort
101 pushing to $TESTTMP/source
102 searching for changes
103 adding changesets
104 adding manifests
105 adding file changes
106 added 1 changesets with 1 changes to 1 files