Mercurial > hg
annotate tests/test-merge2.t @ 35065:a1de4ffaa7a8
hgweb: show commit phase if it's not public
In spartan theme phase is shown on its own table row, because there's no single
line of "tags". Everywhere else phase is prepended to the list of "tags" of a
changeset. Its element has a purple-ish color in gitweb and monoblue, and a
dotted line under it and no color in paper and coal (as these themes are frugal
with colors).
This patch intentionally doesn't touch graph, because it needs a rewrite. I'll
get to it pretty soon and in the process will add phase and everything that's
still coming (e.g. obsolescence and instabilities).
.. feature::
hgweb now displays phases of non-public changesets
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 16 Nov 2017 22:21:03 +0800 |
parents | f2719b387380 |
children | 1850066f9e36 |
rev | line source |
---|---|
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
1 $ hg init t |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
2 $ cd t |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
3 $ echo This is file a1 > a |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
4 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
5 $ hg commit -m "commit #0" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
6 $ echo This is file b1 > b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
7 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
8 $ hg commit -m "commit #1" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
9 $ rm b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
10 $ hg update 0 |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
11 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
12 $ echo This is file b2 > b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
13 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
14 $ hg commit -m "commit #2" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
15 created new head |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
16 $ cd ..; rm -r t |
409 | 17 |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
18 $ mkdir t |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
19 $ cd t |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
20 $ hg init |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
21 $ echo This is file a1 > a |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
22 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
23 $ hg commit -m "commit #0" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
24 $ echo This is file b1 > b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
25 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
26 $ hg commit -m "commit #1" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
27 $ rm b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
28 $ hg update 0 |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
30 $ echo This is file b2 > b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
31 $ hg commit -A -m "commit #2" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
32 adding b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
33 created new head |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
34 $ cd ..; rm -r t |
409 | 35 |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
12156
diff
changeset
|
36 $ hg init t |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
37 $ cd t |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
38 $ echo This is file a1 > a |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
39 $ hg add a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
40 $ hg commit -m "commit #0" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
41 $ echo This is file b1 > b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
42 $ hg add b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
43 $ hg commit -m "commit #1" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
44 $ rm b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
45 $ hg remove b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
46 $ hg update 0 |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
47 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
48 $ echo This is file b2 > b |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11976
diff
changeset
|
49 $ hg commit -A -m "commit #2" |
11976
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
50 adding b |
b28fc3b3efd6
tests: unify test-merge2
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
3988
diff
changeset
|
51 created new head |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
52 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
53 $ cd .. |