annotate tests/test-topic-flow-publish-bare.t @ 6876:2edffcd94850

topic: make debugformatfqbn use short format by default This is to make the debug command more consistent with the internal API.
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 19 Sep 2024 16:50:21 +0400
parents 445240ccb701
children 9da0114a8a02
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
1 =====================
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
2 Test workflow options
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
3 =====================
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
4
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
5 $ . "$TESTDIR/testlib/topic_setup.sh"
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
6 $ . "$TESTDIR/testlib/common.sh"
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
7
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
8 Also testing auto-publish config option with this publishing mode
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
9
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
10 $ cat << EOF >> "$HGRCPATH"
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
11 > [ui]
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
12 > ssh = "$PYTHON" "$RUNTESTDIR/dummyssh"
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
13 > [experimental]
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
14 > auto-publish = warn
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
15 > [alias]
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
16 > tgl = log --rev 'sort(\$1, "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
17 > EOF
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
18
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
19 Publishing of bare branch
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
20 =========================
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
21
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
22 $ hg init bare-branch-server
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
23 $ cd bare-branch-server
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
24 $ cat <<EOF >> .hg/hgrc
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
25 > [phases]
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
26 > publish = no
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
27 > [experimental]
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
28 > topic.publish-bare-branch = yes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
29 > EOF
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
30 $ mkcommit ROOT
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
31 $ mkcommit c_dA0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
32 $ hg phase --public -r 'all()'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
33 $ cd ..
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
34
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
35 $ hg clone bare-branch-server bare-client
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
36 updating to branch default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
37 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
38
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
39 pushing a simple branch publish it
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
40 ----------------------------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
41
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
42 $ cd bare-client
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
43 $ mkcommit c_dB0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
44 $ hg push
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
45 pushing to $TESTTMP/bare-branch-server
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
46 1 changesets about to be published
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
47 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
48 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
49 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
50 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
51 added 1 changesets with 1 changes to 1 files
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
52 $ hg tgl 'all()'
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
53 @ 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
54 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
55 o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
56 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
57 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
58
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
59
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
60 pushing two heads at the same time
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
61 ----------------------------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
62
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
63 $ hg update 'desc("c_dA0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
65 $ mkcommit c_dC0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
66 created new head
3397
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3158
diff changeset
67 (consider using topic for lightweight branches. See 'hg help topic')
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
68 $ hg update 'desc("c_dA0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
69 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
70 $ mkcommit c_dD0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
71 created new head
3397
f7129e3d5a38 topic: suggest using topic when user creates a new head on branch
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3158
diff changeset
72 (consider using topic for lightweight branches. See 'hg help topic')
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
73 $ hg push -f
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
74 pushing to $TESTTMP/bare-branch-server
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
75 2 changesets about to be published
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
76 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
77 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
78 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
79 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
80 added 2 changesets with 2 changes to 2 files (+2 heads)
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
81 $ hg tgl 'all()'
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
82 @ 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
83 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
84 | o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
85 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
86 | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
87 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
88 o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
89 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
90 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
91
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
92
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
93 pushing something not on default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
94 --------------------------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
95
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
96 $ hg update 'desc("ROOT")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
97 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
98 $ hg branch double//slash
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
99 marked working directory as branch double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
100 (branches are permanent and global, did you want a bookmark?)
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
101 $ mkcommit c_aE0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
102 $ hg push --new-branch
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
103 pushing to $TESTTMP/bare-branch-server
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
104 1 changesets about to be published
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
105 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
106 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
107 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
108 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
109 added 1 changesets with 1 changes to 1 files (+1 heads)
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
110 $ hg tgl 'all()'
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
111 @ 5:ffb83c22f2ce c_aE0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
112 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
113 | o 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
114 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
115 | | o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
116 | |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
117 | | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
118 | |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
119 | o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
120 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
121 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
122
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
123
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
124 pushing topic
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
125 -------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
126
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
127 $ hg update 'desc("c_dD0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
128 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
129 $ hg topic foo
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
130 marked working directory as topic: foo
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
131 $ mkcommit c_dF0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
132 active topic 'foo' grew its first changeset
3769
1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 3397
diff changeset
133 (see 'hg help topics' for more information)
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
134 $ hg push
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
135 pushing to $TESTTMP/bare-branch-server
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
136 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
137 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
138 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
139 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
140 added 1 changesets with 1 changes to 1 files
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
141 $ hg tgl 'all()'
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
142 @ 6:0867c4471796 c_dF0 draft default foo
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
143 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
144 o 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
145 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
146 | o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
147 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
148 | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
149 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
150 o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
151 |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
152 | o 5:ffb83c22f2ce c_aE0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
153 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
154 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
155
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
156
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
157 pushing topic over a bare branch
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
158 --------------------------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
159
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
160 $ hg update 'desc("c_dC0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
161 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
162 $ mkcommit c_dG0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
163 $ hg topic bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
164 marked working directory as topic: bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
165 $ mkcommit c_dH0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
166 active topic 'bar' grew its first changeset
3769
1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 3397
diff changeset
167 (see 'hg help topics' for more information)
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
168 $ hg push
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
169 pushing to $TESTTMP/bare-branch-server
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
170 1 changesets about to be published
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
171 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
172 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
173 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
174 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
175 added 2 changesets with 2 changes to 2 files
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
176 $ hg tgl 'all()'
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
177 @ 8:858be9a8daaf c_dH0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
178 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
179 o 7:0e4041d324d0 c_dG0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
180 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
181 o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
182 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
183 | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
184 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
185 | o 6:0867c4471796 c_dF0 draft default foo
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
186 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
187 | o 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
188 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
189 o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
190 |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
191 | o 5:ffb83c22f2ce c_aE0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
192 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
193 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
194
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
195
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
196 Pushing topic in between bare branch
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
197 ------------------------------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
198
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
199 $ hg update 'desc("c_dB0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
200 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
201 $ mkcommit c_dI0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
202 $ hg update 'desc("c_dH0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
203 switching to topic bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
204 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
205 $ mkcommit c_dJ0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
206 $ hg update 'desc("c_aE0")'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
207 1 files updated, 0 files merged, 5 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
208 $ mkcommit c_aK0
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
209 $ hg push
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
210 pushing to $TESTTMP/bare-branch-server
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
211 2 changesets about to be published
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
212 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
213 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
214 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
215 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
216 added 3 changesets with 3 changes to 3 files
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
217 $ hg tgl 'all()'
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
218 @ 11:a6836f5ce4fe c_aK0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
219 |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
220 o 5:ffb83c22f2ce c_aE0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
221 |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
222 | o 10:abb5c84eb9e9 c_dJ0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
223 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
224 | o 8:858be9a8daaf c_dH0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
225 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
226 | o 7:0e4041d324d0 c_dG0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
227 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
228 | o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
229 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
230 | | o 9:4b5570d89f0f c_dI0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
231 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
232 | | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
233 | |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
234 | | o 6:0867c4471796 c_dF0 draft default foo
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
235 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
236 | | o 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
237 | |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
238 | o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
239 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
240 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
241
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
242
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
243 merging a topic in branch
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
244 -------------------------
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
245
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
246 $ hg update default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
247 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
248 $ hg merge foo
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
249 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
250 (branch merge, don't forget to commit)
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
251 $ hg ci -m 'c_dL0'
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
252 $ hg push
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
253 pushing to $TESTTMP/bare-branch-server
5927
0b7328d7503a tests: add simple auto-publish checks alongside publish-bare-branch checks
Anton Shestakov <av6@dwimlabs.net>
parents: 5221
diff changeset
254 2 changesets about to be published
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
255 searching for changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
256 adding changesets
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
257 adding manifests
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
258 adding file changes
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
259 added 1 changesets with 0 changes to 0 files (-1 heads)
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
260 $ hg tgl 'all()'
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
261 @ 12:a6f9f8c6c6cc c_dL0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
262 |\
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
263 | o 9:4b5570d89f0f c_dI0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
264 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
265 o | 6:0867c4471796 c_dF0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
266 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
267 o | 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
268 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
269 | | o 10:abb5c84eb9e9 c_dJ0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
270 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
271 | | o 8:858be9a8daaf c_dH0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
272 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
273 | | o 7:0e4041d324d0 c_dG0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
274 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
275 +---o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
276 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
277 | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
278 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
279 o 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
280 |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
281 | o 11:a6836f5ce4fe c_aK0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
282 | |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
283 | o 5:ffb83c22f2ce c_aE0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
284 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
285 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
286
5929
d46cd7cfff39 tests: add an alias for log -G with topo sort for convenience
Anton Shestakov <av6@dwimlabs.net>
parents: 5928
diff changeset
287 $ hg tgl 'all()' -R ../bare-branch-server
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
288 o 12:a6f9f8c6c6cc c_dL0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
289 |\
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
290 | o 9:4b5570d89f0f c_dI0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
291 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
292 o | 6:0867c4471796 c_dF0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
293 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
294 o | 4:9bf953aa81f6 c_dD0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
295 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
296 | | o 10:abb5c84eb9e9 c_dJ0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
297 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
298 | | o 8:858be9a8daaf c_dH0 draft default bar
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
299 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
300 | | o 7:0e4041d324d0 c_dG0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
301 | | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
302 +---o 3:9d5b8e1f08a4 c_dC0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
303 | |
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
304 | o 2:286d02a6e2a2 c_dB0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
305 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
306 @ 1:134bc3852ad2 c_dA0 public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
307 |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
308 | o 11:a6836f5ce4fe c_aK0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
309 | |
6327
eac8880c145e tests: switch to double//slash branch in test-topic-flow-publish-bare.t
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
310 | o 5:ffb83c22f2ce c_aE0 public double//slash
3158
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
311 |/
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
312 o 0:ea207398892e ROOT public default
678a9802c56b topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
313
4647
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
314
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
315 Checking the option to prevent publishing
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
316 =========================================
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
317
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
318 Alone the option is a bit too restrictive to be useful. However combined with
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
319 other tooling or extensions is can become an important permission tool.
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
320
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
321 $ hg log -r 'draft()'
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
322 changeset: 8:858be9a8daaf
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
323 topic: bar
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
324 user: test
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
325 date: Thu Jan 01 00:00:00 1970 +0000
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
326 summary: c_dH0
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
327
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
328 changeset: 10:abb5c84eb9e9
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
329 topic: bar
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
330 parent: 8:858be9a8daaf
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
331 user: test
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
332 date: Thu Jan 01 00:00:00 1970 +0000
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
333 summary: c_dJ0
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
334
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
335 $ hg phase --public -r 8 --config experimental.topic.allow-publish=no
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
336 abort: rejecting publishing of changeset 858be9a8daaf
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
337 [255]
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
338 $ hg phase --public -r 10 --config experimental.topic.allow-publish=no
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
339 abort: rejecting publishing of changeset 858be9a8daaf and 1 others
228caeb8b7af topic: add a simple option to reject publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3769
diff changeset
340 [255]
5221
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
341
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
342 Checking the option to prevent automatic publishing
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
343 ===================================================
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
344
6381
60daa7887c49 branching: merge test changes from before topic namespaces
Anton Shestakov <av6@dwimlabs.net>
parents: 6296 6327
diff changeset
345 $ hg up double//slash//
5221
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
346 2 files updated, 0 files merged, 5 files removed, 0 files unresolved
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
347
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
348 Making sure the topic-publishing mode is announced as a capability
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
349
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
350 $ hg debugcapabilities $TESTTMP/bare-branch-server | grep topics
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
351 ext-topics-publish=auto
6548
445240ccb701 topic: add experimental.tns-default-pull-namespaces config option
Anton Shestakov <av6@dwimlabs.net>
parents: 6381
diff changeset
352 ext-topics-tns-heads
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
353 topics
6296
a2855aff1268 topic: call a different wire protocol command to get tns-aware branchmap
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
354 topics-namespaces
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
355 $ hg debugcapabilities ssh://user@dummy/bare-branch-server | grep topics
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
356 _exttopics_heads
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
357 ext-topics-publish=auto
6548
445240ccb701 topic: add experimental.tns-default-pull-namespaces config option
Anton Shestakov <av6@dwimlabs.net>
parents: 6381
diff changeset
358 ext-topics-tns-heads
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
359 topics
6296
a2855aff1268 topic: call a different wire protocol command to get tns-aware branchmap
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
360 topics-namespaces
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
361 $ hg serve -R ../bare-branch-server -p $HGPORT -d --pid-file hg.pid
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
362 $ cat hg.pid >> $DAEMON_PIDS
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
363 $ hg debugcapabilities http://localhost:$HGPORT | grep topics
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
364 _exttopics_heads
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
365 ext-topics-publish=auto
6548
445240ccb701 topic: add experimental.tns-default-pull-namespaces config option
Anton Shestakov <av6@dwimlabs.net>
parents: 6381
diff changeset
366 ext-topics-tns-heads
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
367 topics
6296
a2855aff1268 topic: call a different wire protocol command to get tns-aware branchmap
Anton Shestakov <av6@dwimlabs.net>
parents: 6039
diff changeset
368 topics-namespaces
5931
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
369 $ killdaemons.py
6357551cb66f topic: announce ext-topics-publish capability in case of SSH and HTTP too
Anton Shestakov <av6@dwimlabs.net>
parents: 5929
diff changeset
370
5221
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
371 Trying to push changeset without topic (would publish them)
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
372
6039
51249e4e9025 tests: port upstream 86f39a89b63e to our version of mkcommit()
Anton Shestakov <av6@dwimlabs.net>
parents: 5932
diff changeset
373 $ mkcommit c_aM0 --secret
5932
fe25ec8f0124 topic: use "served" repo filter to guess what the server will publish
Anton Shestakov <av6@dwimlabs.net>
parents: 5931
diff changeset
374 $ hg push --config experimental.auto-publish=abort -r .
fe25ec8f0124 topic: use "served" repo filter to guess what the server will publish
Anton Shestakov <av6@dwimlabs.net>
parents: 5931
diff changeset
375 pushing to $TESTTMP/bare-branch-server
fe25ec8f0124 topic: use "served" repo filter to guess what the server will publish
Anton Shestakov <av6@dwimlabs.net>
parents: 5931
diff changeset
376 searching for changes
fe25ec8f0124 topic: use "served" repo filter to guess what the server will publish
Anton Shestakov <av6@dwimlabs.net>
parents: 5931
diff changeset
377 no changes found (ignored 1 secret changesets)
fe25ec8f0124 topic: use "served" repo filter to guess what the server will publish
Anton Shestakov <av6@dwimlabs.net>
parents: 5931
diff changeset
378 [1]
fe25ec8f0124 topic: use "served" repo filter to guess what the server will publish
Anton Shestakov <av6@dwimlabs.net>
parents: 5931
diff changeset
379 $ hg phase --draft
5221
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
380 $ hg push --config experimental.auto-publish=abort -r .
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
381 pushing to $TESTTMP/bare-branch-server
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
382 abort: push would publish 1 changesets
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
383 (use --publish or adjust 'experimental.auto-publish' config)
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
384 [255]
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
385 $ hg push --config experimental.auto-publish=abort -r . --publish
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
386 pushing to $TESTTMP/bare-branch-server
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
387 searching for changes
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
388 adding changesets
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
389 adding manifests
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
390 adding file changes
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
391 added 1 changesets with 1 changes to 1 files
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
392
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
393 Pushing a changeset with topic (not publishing, no warning)
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
394
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
395 $ hg topic test-push-protection
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
396 marked working directory as topic: test-push-protection
5928
16d36635f859 tests: it's N after M
Anton Shestakov <av6@dwimlabs.net>
parents: 5927
diff changeset
397 $ mkcommit c_aN0
5221
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
398 active topic 'test-push-protection' grew its first changeset
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
399 (see 'hg help topics' for more information)
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
400 $ hg push --config experimental.auto-publish=abort -r .
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
401 pushing to $TESTTMP/bare-branch-server
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
402 searching for changes
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
403 adding changesets
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
404 adding manifests
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
405 adding file changes
af9f40236037 topics: fix auto-publish=abort with servers publishing bare branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4647
diff changeset
406 added 1 changesets with 1 changes to 1 files