author | Anton Shestakov <av6@dwimlabs.net> |
Thu, 07 May 2020 01:29:48 +0200 | |
changeset 5349 | e8660b28bfee |
parent 5339 | 258c0a99c5b0 |
child 5362 | 72340abfcece |
permissions | -rw-r--r-- |
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
1 |
Testing obslog and other commands accessing obsolete revisions. |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
Global setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
============ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
|
3885
3df8b6ecce2a
tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
3884
diff
changeset
|
6 |
$ . $TESTDIR/testlib/obshistory_setup.sh |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
|
4455
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4294
diff
changeset
|
8 |
Test output with split commit |
b58e45aa9be2
test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4294
diff
changeset
|
9 |
============================= |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 |
$ hg init $TESTTMP/local-split |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
15 |
$ hg init $TESTTMP/server |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 |
$ cd $TESTTMP/local-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 |
$ mkcommit ROOT |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
18 |
$ sync |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
$ echo 42 >> a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
$ echo 43 >> b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
$ hg commit -A -m "A0" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
@ changeset: 1:471597cad322 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
|
3216
13cb0810ce22
split: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3154
diff
changeset
|
36 |
$ hg split -r 'desc(A0)' -n "testing split" -d "0 0" << EOF |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 |
> n |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
40 |
> y |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 |
> EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 |
0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 |
adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 |
adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 |
diff --git a/a b/a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |
new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
49 |
examine changes to 'a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
50 |
(enter ? for help) [Ynesfdaq?] y |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 |
+42 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
54 |
record change 1/2 to 'a'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
55 |
(enter ? for help) [Ynesfdaq?] y |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 |
diff --git a/b b/b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 |
new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
59 |
examine changes to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
60 |
(enter ? for help) [Ynesfdaq?] n |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 |
created new head |
4294
8974a05a49fa
split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4293
diff
changeset
|
63 |
continue splitting? [Ycdq?] y |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 |
diff --git a/b b/b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 |
new file mode 100644 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
66 |
examine changes to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
67 |
(enter ? for help) [Ynesfdaq?] y |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 |
+43 |
4712
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
71 |
record this change to 'b'? |
e2c548cc83b5
tests: update output for shorted prompts from Mercurial
Martin von Zweigbergk <martinvonz@google.com>
parents:
4455
diff
changeset
|
72 |
(enter ? for help) [Ynesfdaq?] y |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 |
no more change to split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
|
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
76 |
$ sync |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
77 |
|
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 |
@ changeset: 3:f257fde29c7a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
o changeset: 2:337fec4d2edc |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
91 |
| x changeset: 1:471597cad322 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3567
5ddea3b8d2a4
split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3566
diff
changeset
|
94 |
| obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
95 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
96 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
98 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
99 |
date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 |
|
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
102 |
Check output on the client side |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
103 |
------------------------------- |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
105 |
Check that obslog on split commit shows both targets |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
106 |
$ hg obslog 471597cad322 --hidden --patch --no-origin |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
107 |
x 471597cad322 (1) A0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
108 |
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
3223
73b4e84df0bd
obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3216
diff
changeset
|
109 |
note: testing split |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
110 |
(No patch available, too many successors (2)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
111 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
112 |
$ hg obslog 471597cad322 --hidden --no-graph --no-origin -Tjson | python -m json.tool |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
113 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
114 |
{ |
2957 | 115 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
116 |
{ |
5171
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5170
diff
changeset
|
117 |
"dates": [ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5170
diff
changeset
|
118 |
[ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5170
diff
changeset
|
119 |
*, (glob) |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5170
diff
changeset
|
120 |
0 |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5170
diff
changeset
|
121 |
] |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
122 |
], |
4939
7aba58dc4b73
obslog: use plural name "effects" for list of all effects
Martin von Zweigbergk <martinvonz@google.com>
parents:
4918
diff
changeset
|
123 |
"effects": [ |
2957 | 124 |
"parent", |
125 |
"content" |
|
126 |
], |
|
5170
f8488bdc9e4b
obslog: make note template property into notes
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
127 |
"notes": [ |
f8488bdc9e4b
obslog: make note template property into notes
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
128 |
"testing split" |
f8488bdc9e4b
obslog: make note template property into notes
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
129 |
], |
5169
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
130 |
"operations": [ |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
131 |
"split" |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
132 |
], |
2957 | 133 |
"succnodes": [ |
4951
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4948
diff
changeset
|
134 |
"337fec4d2edcf0e7a467e35f818234bc620068b5", |
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4948
diff
changeset
|
135 |
"f257fde29c7a847c9b607f6e958656d0df0fb15c" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
136 |
], |
5168
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
137 |
"users": [ |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
138 |
"test" |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
139 |
], |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
140 |
"verb": "split" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
141 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
142 |
], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4964
diff
changeset
|
143 |
"node": "471597cad322d1f659bb169751be9133dad92ef3", |
2957 | 144 |
"shortdescription": "A0" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
145 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
146 |
] |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
147 |
$ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
148 |
[ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
149 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
150 |
"markers": [], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
151 |
"node": "471597cad322d1f659bb169751be9133dad92ef3", |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
152 |
"shortdescription": "A0" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
153 |
} |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
154 |
] |
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
155 |
Check that obslog on the first successor after split shows the revision plus |
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
156 |
the split one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
157 |
$ hg obslog 337fec4d2edc --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
158 |
o 337fec4d2edc (2) A0 |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
159 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
160 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
161 |
| diff -r 471597cad322 -r 337fec4d2edc b |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
162 |
| --- a/b Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
163 |
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
164 |
| @@ -1,1 +0,0 @@ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
165 |
| -43 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
166 |
| |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
167 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
168 |
x 471597cad322 (1) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
169 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
170 |
With the all option, it should show all three changesets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
171 |
$ hg obslog --all 337fec4d2edc --patch |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
172 |
o 337fec4d2edc (2) A0 |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
173 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
174 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
175 |
| diff -r 471597cad322 -r 337fec4d2edc b |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
176 |
| --- a/b Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
177 |
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
178 |
| @@ -1,1 +0,0 @@ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
179 |
| -43 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
180 |
| |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
181 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
182 |
| @ f257fde29c7a (3) A0 |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
183 |
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
184 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
185 |
| (No patch available, changesets rebased) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
186 |
| |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
187 |
x 471597cad322 (1) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
188 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
189 |
Check that obslog on the second successor after split shows the revision plus |
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
190 |
the split one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
191 |
$ hg obslog f257fde29c7a --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
192 |
@ f257fde29c7a (3) A0 |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
193 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
194 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
195 |
| (No patch available, changesets rebased) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
196 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
197 |
x 471597cad322 (1) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
198 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
199 |
With the all option, it should show all three changesets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
200 |
$ hg obslog f257fde29c7a --all --patch |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
201 |
o 337fec4d2edc (2) A0 |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
202 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
203 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
204 |
| diff -r 471597cad322 -r 337fec4d2edc b |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
205 |
| --- a/b Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
206 |
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
207 |
| @@ -1,1 +0,0 @@ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
208 |
| -43 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
209 |
| |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
210 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
211 |
| @ f257fde29c7a (3) A0 |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
212 |
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
213 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
214 |
| (No patch available, changesets rebased) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
215 |
| |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
216 |
x 471597cad322 (1) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
217 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
218 |
Obslog with all option should also works on the split commit |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
219 |
$ hg obslog -a 471597cad322 --hidden --patch --no-origin |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
220 |
o 337fec4d2edc (2) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
221 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
222 |
| @ f257fde29c7a (3) A0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
223 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
224 |
x 471597cad322 (1) A0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
225 |
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
3223
73b4e84df0bd
obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3216
diff
changeset
|
226 |
note: testing split |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
227 |
(No patch available, too many successors (2)) |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
228 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5309
diff
changeset
|
229 |
Check that obslog on both successors after split shows a coherent graph |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
230 |
$ hg obslog 'f257fde29c7a+337fec4d2edc' --patch --no-origin |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
231 |
o 337fec4d2edc (2) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
232 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
233 |
| @ f257fde29c7a (3) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
234 |
|/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
235 |
x 471597cad322 (1) A0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
236 |
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
3223
73b4e84df0bd
obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3216
diff
changeset
|
237 |
note: testing split |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
238 |
(No patch available, too many successors (2)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
239 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
240 |
$ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
241 |
o 337fec4d2edc (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
242 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
243 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
244 |
| diff -r 471597cad322 -r 337fec4d2edc b |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
245 |
| --- a/b Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
246 |
| +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
247 |
| @@ -1,1 +0,0 @@ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
248 |
| -43 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
249 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
250 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
251 |
| @ f257fde29c7a (3) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
252 |
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
253 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
254 |
| (No patch available, changesets rebased) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
255 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
256 |
x 471597cad322 (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
257 |
|
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
258 |
$ hg update 471597cad322 |
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
259 |
abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! |
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
260 |
(use --hidden to access hidden revisions) |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
261 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
262 |
$ hg update --hidden 'min(desc(A0))' |
3747
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
263 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
264 |
updated to hidden changeset 471597cad322 |
3432
f57be161f34b
test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3417
diff
changeset
|
265 |
(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
266 |
working directory parent is obsolete! (471597cad322) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
267 |
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
268 |
|
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
269 |
Check output on the server side |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
270 |
------------------------------- |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
271 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
272 |
$ hg obslog -R $TESTTMP/server --patch tip --no-origin |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
273 |
o f257fde29c7a (2) A0 |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
274 |
| |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
275 |
x 471597cad322 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
276 |
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
277 |
note: testing split |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
278 |
(No patch available, context is not local) |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
279 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
280 |
$ hg obslog -R $TESTTMP/server -f --patch tip --no-origin |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
281 |
o f257fde29c7a (2) A0 |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
282 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
283 |
$ hg obslog -R $TESTTMP/server --all --patch tip --no-origin |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
284 |
o 337fec4d2edc (1) A0 |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
285 |
| |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
286 |
| o f257fde29c7a (2) A0 |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
287 |
|/ |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
288 |
x 471597cad322 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
289 |
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
290 |
note: testing split |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
291 |
(No patch available, context is not local) |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
292 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
293 |
$ hg obslog -R $TESTTMP/server --all -f --patch tip --no-origin |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
294 |
o 337fec4d2edc (1) A0 |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
295 |
|
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
296 |
o f257fde29c7a (2) A0 |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
297 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
298 |
$ hg obslog -R $TESTTMP/server --no-graph --all --patch tip --no-origin |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
299 |
f257fde29c7a (2) A0 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
300 |
|
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
301 |
471597cad322 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
302 |
split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
303 |
note: testing split |
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
304 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
305 |
|
5309
9923c6d6f0a8
obslog: support --all with --no-graph
Anton Shestakov <av6@dwimlabs.net>
parents:
5308
diff
changeset
|
306 |
337fec4d2edc (1) A0 |
9923c6d6f0a8
obslog: support --all with --no-graph
Anton Shestakov <av6@dwimlabs.net>
parents:
5308
diff
changeset
|
307 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
308 |
$ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip --no-origin |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
309 |
f257fde29c7a (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
310 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
311 |
337fec4d2edc (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
312 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
313 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
314 |
$ hg obslog -R $TESTTMP/server --patch tip |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
315 |
o f257fde29c7a (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
316 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
317 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
318 |
| (No patch available, predecessor is unknown locally) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
319 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
320 |
x 471597cad322 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
321 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
322 |
$ hg obslog -R $TESTTMP/server -f --patch tip |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
323 |
o f257fde29c7a (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
324 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
325 |
$ hg obslog -R $TESTTMP/server --all --patch tip |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
326 |
o 337fec4d2edc (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
327 |
| split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
328 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
329 |
| (No patch available, predecessor is unknown locally) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
330 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
331 |
| o f257fde29c7a (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
332 |
|/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
333 |
| note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
334 |
| (No patch available, predecessor is unknown locally) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
335 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
336 |
x 471597cad322 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
337 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
338 |
$ hg obslog -R $TESTTMP/server --all -f --patch tip |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
339 |
o 337fec4d2edc (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
340 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
341 |
o f257fde29c7a (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
342 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
343 |
$ hg obslog -R $TESTTMP/server --no-graph --all --patch tip |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
344 |
f257fde29c7a (2) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
345 |
split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
346 |
note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
347 |
(No patch available, predecessor is unknown locally) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
348 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
349 |
471597cad322 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
350 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
351 |
337fec4d2edc (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
352 |
split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
353 |
note: testing split |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
354 |
(No patch available, predecessor is unknown locally) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
355 |
|
3896
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
356 |
$ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip |
7b782e419df7
obslog: check filtered output with splitted changesets
Boris Feld <boris.feld@octobus.net>
parents:
3888
diff
changeset
|
357 |
f257fde29c7a (2) A0 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
358 |
|
5309
9923c6d6f0a8
obslog: support --all with --no-graph
Anton Shestakov <av6@dwimlabs.net>
parents:
5308
diff
changeset
|
359 |
337fec4d2edc (1) A0 |
9923c6d6f0a8
obslog: support --all with --no-graph
Anton Shestakov <av6@dwimlabs.net>
parents:
5308
diff
changeset
|
360 |