Mercurial > evolve
annotate tests/test-stack-branch.t @ 6846:6d61440357af
tests: check metadata and long description using `setup.py check`
This probably isn't very useful to us, since at the moment the metadata check
cares only about the presence of "name" and "version", and the reST check makes
sure our long_description renders properly (we build the docs, so we would
probably see any render errors, just in a different place), but this is a
simple command, so let's add it.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 11 Sep 2024 17:29:04 +0400 |
parents | 90f867d5be22 |
children |
rev | line source |
---|---|
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 $ . "$TESTDIR/testlib/topic_setup.sh" |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 Initial setup |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 $ cat << EOF >> $HGRCPATH |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 > [ui] |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 > logtemplate = {rev} {branch} \{{get(namespaces, "topics")}} {phase} {desc|firstline}\n |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 > [experimental] |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 > evolution=createmarkers,exchange,allowunstable |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 > EOF |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 $ hg init main |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 $ cd main |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
15 $ hg branch double//slash |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
16 marked working directory as branch double//slash |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 (branches are permanent and global, did you want a bookmark?) |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 $ echo aaa > aaa |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 $ hg add aaa |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 $ hg commit -m c_a |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 $ echo aaa > bbb |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 $ hg add bbb |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 $ hg commit -m c_b |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
24 $ hg branch foo//bar |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
25 marked working directory as branch foo//bar |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 $ echo aaa > ccc |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 $ hg add ccc |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 $ hg commit -m c_c |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 $ echo aaa > ddd |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 $ hg add ddd |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 $ hg commit -m c_d |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 $ echo aaa > eee |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 $ hg add eee |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 $ hg commit -m c_e |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 $ echo aaa > fff |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 $ hg add fff |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 $ hg commit -m c_f |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 $ hg log -G |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
39 @ 5 foo//bar {} draft c_f |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
41 o 4 foo//bar {} draft c_e |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
43 o 3 foo//bar {} draft c_d |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
45 o 2 foo//bar {} draft c_c |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
47 o 1 double//slash {} draft c_b |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
49 o 0 double//slash {} draft c_a |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 |
6379
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
52 Commit extras have branch name without formatting |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
53 ------------------------------------------------- |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
54 |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
55 $ hg log -r 1 -T '{rev}: {join(extras, " ")}\n' |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
56 1: branch=double//slash |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
57 $ hg log -r 5 -T '{rev}: {join(extras, " ")}\n' |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
58 5: branch=foo//bar |
c5848d8b664d
tests: make sure we properly store branch name in commit extras
Anton Shestakov <av6@dwimlabs.net>
parents:
6376
diff
changeset
|
59 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
60 Check that branch without any parent does not crash stack |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 --------------------------------------------------------- |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 |
6376
5c8196a550b6
topic: make hg stack work for branches with double slashes in them
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
63 $ hg up double//slash// |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
64 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
66 ### target: double//slash (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
67 s2@ c_b (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
68 s1: c_a |
6376
5c8196a550b6
topic: make hg stack work for branches with double slashes in them
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
69 $ hg phase --public 'branch("double//slash//")' |
5c8196a550b6
topic: make hg stack work for branches with double slashes in them
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
70 $ hg up foo//bar// |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 Simple test |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
74 ----------- |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
76 'hg stack' lists all changeset on the branch |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
78 $ hg branch |
6828
90f867d5be22
topic: make hg branch command output FQBN
Anton Shestakov <av6@dwimlabs.net>
parents:
6381
diff
changeset
|
79 foo//bar// |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
80 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
81 ### target: foo//bar (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
82 s4@ c_f (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
83 s3: c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
84 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
85 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
86 s0^ c_b (base) |
2750
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
87 $ hg stack -v |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
88 ### target: foo//bar (branch) |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
89 s4(18b3ff044de9)@ c_f (current) |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
90 s3(b1913e064ca1): c_e |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
91 s2(8fad7e98adf6): c_d |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
92 s1(da14ac95d156): c_c |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
93 s0(2450a061c0f0)^ c_b (base) |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
94 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
95 Test "s#" reference |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
96 ------------------- |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
97 |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
98 $ hg up s2 |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
99 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
6376
5c8196a550b6
topic: make hg stack work for branches with double slashes in them
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
100 $ hg up foo//bar// |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
102 $ hg up s42 |
6376
5c8196a550b6
topic: make hg stack work for branches with double slashes in them
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
103 abort: cannot resolve "s42": branch "foo//bar//" has only 4 non-public changesets |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
104 [255] |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
105 $ hg up s2 |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
106 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
107 $ hg summary |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
108 parent: 3:8fad7e98adf6 |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
109 c_d |
6376
5c8196a550b6
topic: make hg stack work for branches with double slashes in them
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
110 branch: foo//bar// |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
111 commit: (clean) |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
112 update: 2 new changesets (update) |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
113 phases: 4 draft |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
114 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
115 Case with some of the branch unstable |
4471
3caa4a459439
tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4436
diff
changeset
|
116 ------------------------------------- |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
117 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
118 $ echo bbb > ddd |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
119 $ hg commit --amend |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
120 2 new orphan changesets |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
121 $ hg log -G |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
122 @ 6 foo//bar {} draft c_d |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
123 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
124 | * 5 foo//bar {} draft c_f |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
125 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
126 | * 4 foo//bar {} draft c_e |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
127 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
128 | x 3 foo//bar {} draft c_d |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
129 |/ |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
130 o 2 foo//bar {} draft c_c |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
131 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
132 o 1 double//slash {} public c_b |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
133 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
134 o 0 double//slash {} public c_a |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
135 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
136 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
137 ### target: foo//bar (branch) |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
138 s4$ c_f (orphan) |
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
139 s3$ c_e (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
140 s2@ c_d (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
141 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
142 s0^ c_b (base) |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
143 $ hg up s3 |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
144 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
145 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
146 ### target: foo//bar (branch) |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
147 s4$ c_f (orphan) |
4436
ef155f624670
stack: make @ (current) more important than $ (some sort of unstable)
Anton Shestakov <av6@dwimlabs.net>
parents:
4432
diff
changeset
|
148 s3@ c_e (current orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
149 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
150 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
151 s0^ c_b (base) |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
152 $ hg up s2 |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
153 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
154 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
155 Also test the revset: |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
156 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
157 $ hg log -r 'stack()' |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
158 2 foo//bar {} draft c_c |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
159 6 foo//bar {} draft c_d |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
160 4 foo//bar {} draft c_e |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
161 5 foo//bar {} draft c_f |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
162 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
163 Case with multiple heads on the branch |
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
164 -------------------------------------- |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
165 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
166 Make things linear again |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
167 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
168 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
169 rebasing 4:b1913e064ca1 "c_e" |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
170 rebasing 5:18b3ff044de9 "c_f" |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
171 $ hg log -G |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
172 o 8 foo//bar {} draft c_f |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
173 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
174 o 7 foo//bar {} draft c_e |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
175 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
176 @ 6 foo//bar {} draft c_d |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
177 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
178 o 2 foo//bar {} draft c_c |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
179 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
180 o 1 double//slash {} public c_b |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
181 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
182 o 0 double//slash {} public c_a |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
183 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
184 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
185 Create the second head |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
186 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
187 $ hg up 'desc(c_d)' |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
188 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
189 $ echo aaa > ggg |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
190 $ hg add ggg |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
191 $ hg commit -m c_g |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
192 created new head |
3397
f7129e3d5a38
topic: suggest using topic when user creates a new head on branch
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3359
diff
changeset
|
193 (consider using topic for lightweight branches. See 'hg help topic') |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
194 $ echo aaa > hhh |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
195 $ hg add hhh |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
196 $ hg commit -m c_h |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
197 $ hg log -G |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
198 @ 10 foo//bar {} draft c_h |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
199 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
200 o 9 foo//bar {} draft c_g |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
201 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
202 | o 8 foo//bar {} draft c_f |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
203 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
204 | o 7 foo//bar {} draft c_e |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
205 |/ |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
206 o 6 foo//bar {} draft c_d |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
207 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
208 o 2 foo//bar {} draft c_c |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
209 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
210 o 1 double//slash {} public c_b |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
211 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
212 o 0 double//slash {} public c_a |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
213 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
214 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
215 Test output |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
216 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
217 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
218 ### target: foo//bar (branch) (2 heads) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
219 s6@ c_h (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
220 s5: c_g |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
221 s2^ c_d (base) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
222 s4: c_f |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
223 s3: c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
224 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
225 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
226 s0^ c_b (base) |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
227 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
228 Case with multiple heads on the branch with instability involved |
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
229 ---------------------------------------------------------------- |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
230 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
231 We amend the message to make sure the display base pick the right changeset |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
232 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
233 $ hg up 'desc(c_d)' |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
234 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
235 $ echo ccc > ddd |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
236 $ hg commit --amend -m 'c_D' |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
237 4 new orphan changesets |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
238 $ hg rebase -d . -s 'desc(c_g)' |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
239 rebasing 9:8c1819a4441f "c_g" |
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
240 rebasing 10:e255b784f0e9 "c_h" |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
241 $ hg log -G |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
242 o 13 foo//bar {} draft c_h |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
243 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
244 o 12 foo//bar {} draft c_g |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
245 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
246 @ 11 foo//bar {} draft c_D |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
247 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
248 | * 8 foo//bar {} draft c_f |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
249 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
250 | * 7 foo//bar {} draft c_e |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
251 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
252 | x 6 foo//bar {} draft c_d |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
253 |/ |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
254 o 2 foo//bar {} draft c_c |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
255 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
256 o 1 double//slash {} public c_b |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
257 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
258 o 0 double//slash {} public c_a |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
259 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
260 |
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
261 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
262 ### target: foo//bar (branch) (2 heads) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
263 s6: c_h |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
264 s5: c_g |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
265 s2^ c_D (base current) |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
266 s4$ c_f (orphan) |
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
267 s3$ c_e (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
268 s2@ c_D (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
269 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
270 s0^ c_b (base) |
2669
b933a8068c17
topic: add some initial support for using stack on named branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
271 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
272 Check that stack doesn't show public changesets on a branch |
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
273 ----------------------------------------------------------- |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2682
diff
changeset
|
274 |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
275 $ hg log --graph |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
276 o 13 foo//bar {} draft c_h |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
277 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
278 o 12 foo//bar {} draft c_g |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
279 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
280 @ 11 foo//bar {} draft c_D |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
281 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
282 | * 8 foo//bar {} draft c_f |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
283 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
284 | * 7 foo//bar {} draft c_e |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
285 | | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
286 | x 6 foo//bar {} draft c_d |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
287 |/ |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
288 o 2 foo//bar {} draft c_c |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
289 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
290 o 1 double//slash {} public c_b |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
291 | |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
292 o 0 double//slash {} public c_a |
2920
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
293 |
ef4832faaf09
test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2750
diff
changeset
|
294 |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2682
diff
changeset
|
295 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
296 ### target: foo//bar (branch) (2 heads) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
297 s6: c_h |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
298 s5: c_g |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
299 s2^ c_D (base current) |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
300 s4$ c_f (orphan) |
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
301 s3$ c_e (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
302 s2@ c_D (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
303 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
304 s0^ c_b (base) |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
305 $ hg phase --public s1 |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2682
diff
changeset
|
306 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
307 ### target: foo//bar (branch) (2 heads) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
308 s5: c_h |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
309 s4: c_g |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
310 s1^ c_D (base current) |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
311 s3$ c_f (orphan) |
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
312 s2$ c_e (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
313 s1@ c_D (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
314 s0^ c_c (base) |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2682
diff
changeset
|
315 |
6380
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
316 Check that stack doesn't show changesets with a topic |
130ad27064bc
tests: update headers in test-stack-branch.t
Anton Shestakov <av6@dwimlabs.net>
parents:
6379
diff
changeset
|
317 ----------------------------------------------------- |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2682
diff
changeset
|
318 |
4628
c4097632a1a3
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
4471
diff
changeset
|
319 $ hg topic --rev s4::s5 sometopic |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
4067
diff
changeset
|
320 changed topic on 2 changesets to "sometopic" |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2682
diff
changeset
|
321 $ hg stack |
6365
ca9753176053
tests: add double slashes to tests for hg stack
Anton Shestakov <av6@dwimlabs.net>
parents:
4628
diff
changeset
|
322 ### target: foo//bar (branch) |
4432
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
323 s3$ c_f (orphan) |
5da1d162ad50
stack: rename unstable -> orphan
Anton Shestakov <av6@dwimlabs.net>
parents:
4268
diff
changeset
|
324 s2$ c_e (orphan) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
325 s1@ c_D (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
326 s0^ c_c (base) |