author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Fri, 24 Nov 2017 22:36:57 +0100 | |
branch | stable |
changeset 3204 | a342c454ccf3 |
parent 3154 | 406992d0d611 |
child 3166 | e1a230cc4527 |
child 3216 | 13cb0810ce22 |
permissions | -rw-r--r-- |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 |
This test file test the various messages when accessing obsolete |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
revisions. |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
Global setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
============ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
$ . $TESTDIR/testlib/common.sh |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
$ cat >> $HGRCPATH <<EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 |
> [ui] |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
> interactive = true |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
> [phases] |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
> publish=False |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
> [extensions] |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 |
> evolve = |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
15 |
> [experimental] |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
16 |
> evolution.effect-flags = yes |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 |
> EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
Test output on amended commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 |
============================= |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 |
$ hg init $TESTTMP/local-amend |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 |
$ cd $TESTTMP/local-amend |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
$ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 |
$ mkcommit A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
$ echo 42 >> A0 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
30 |
$ hg amend -m "A1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
31 |
> |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
32 |
> Better commit message" |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
$ hg log --hidden -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
34 |
@ changeset: 2:4ae3a4151de9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
| 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
|
39 |
| summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
| x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
44 |
| obsolete: rewritten using amend as 2:4ae3a4151de9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 |
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
|
50 |
summary: ROOT |
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 |
Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 |
----------- |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
54 |
$ hg obslog --patch 4ae3a4151de9 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
55 |
@ 4ae3a4151de9 (2) A1 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
56 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
57 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
58 |
rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
59 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
60 |
+++ b/4ae3a4151de9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
61 |
@@ -1,1 +1,3 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
62 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
63 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
64 |
+ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
65 |
+Better commit message |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
66 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
67 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
68 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
69 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
70 |
@@ -1,1 +1,2 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
71 |
A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
72 |
+42 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
73 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
74 |
|
2954 | 75 |
|
76 |
$ hg obslog --no-graph --patch 4ae3a4151de9 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
77 |
4ae3a4151de9 (2) A1 |
2954 | 78 |
471f378eab4c (1) A0 |
79 |
rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000) |
|
80 |
--- a/471f378eab4c-changeset-description |
|
81 |
+++ b/4ae3a4151de9-changeset-description |
|
82 |
@@ -1,1 +1,3 @@ |
|
83 |
-A0 |
|
84 |
+A1 |
|
85 |
+ |
|
86 |
+Better commit message |
|
87 |
||
88 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
|
89 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
|
90 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
|
91 |
@@ -1,1 +1,2 @@ |
|
92 |
A0 |
|
93 |
+42 |
|
94 |
||
95 |
||
2957 | 96 |
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' |
97 |
@ A1 |
|
98 |
| |
|
99 |
x A0 at 0 0 by test |
|
100 |
||
2441
80b5fc054219
evolve: adding longer aliases for olog
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
2420
diff
changeset
|
101 |
$ hg obslog 4ae3a4151de9 --no-graph -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
|
102 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
103 |
{ |
2957 | 104 |
"markers": [], |
105 |
"node": "4ae3a4151de9", |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
106 |
"rev": 2, |
2957 | 107 |
"shortdescription": "A1" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
108 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
109 |
{ |
2957 | 110 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
111 |
{ |
2957 | 112 |
"date": [ |
113 |
*, (glob) |
|
114 |
0 (glob) |
|
115 |
], |
|
116 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
117 |
"description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
118 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
119 |
], |
2957 | 120 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
121 |
"4ae3a4151de9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
122 |
], |
2957 | 123 |
"user": "test", |
124 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
125 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
126 |
], |
2957 | 127 |
"node": "471f378eab4c", |
128 |
"rev": 1, |
|
129 |
"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
|
130 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
131 |
] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
132 |
$ hg obslog --hidden --patch 471f378eab4c |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
133 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
134 |
rewritten(description, content) as 4ae3a4151de9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
135 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
136 |
+++ b/4ae3a4151de9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
137 |
@@ -1,1 +1,3 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
138 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
139 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
140 |
+ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
141 |
+Better commit message |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
142 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
143 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
144 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
145 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
146 |
@@ -1,1 +1,2 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
147 |
A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
148 |
+42 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
149 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
150 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
151 |
$ hg obslog --hidden 471f378eab4c --no-graph -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
|
152 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
153 |
{ |
2957 | 154 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
155 |
{ |
2957 | 156 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
157 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
158 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
159 |
], |
2957 | 160 |
"effect": [ |
161 |
*, (glob) |
|
162 |
"content" |
|
163 |
], |
|
164 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
165 |
"4ae3a4151de9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
166 |
], |
2957 | 167 |
"user": "test", |
168 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
169 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
170 |
], |
2957 | 171 |
"node": "471f378eab4c", |
172 |
"rev": 1, |
|
173 |
"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
|
174 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
175 |
] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
176 |
$ hg update 471f378eab4c |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
177 |
abort: hidden revision '471f378eab4c'! |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
178 |
(use --hidden to access hidden revisions; successor: 4ae3a4151de9) |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
179 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 |
$ hg update --hidden "desc(A0)" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 |
1 files updated, 0 files merged, 0 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
|
182 |
working directory parent is obsolete! (471f378eab4c) |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
183 |
(use 'hg evolve' to update to its successor: 4ae3a4151de9) |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 |
Test output with pruned commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 |
============================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 |
$ hg init $TESTTMP/local-prune |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 |
$ cd $TESTTMP/local-prune |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 |
$ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 |
$ mkcommit A0 # 0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 |
$ mkcommit B0 # 1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 |
@ changeset: 2:0dec01379d3b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 |
| 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
|
201 |
| summary: B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 |
o changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 |
| 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
|
206 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
210 |
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
|
211 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
212 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
213 |
$ hg prune -r 'desc(B0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
214 |
0 files updated, 0 files merged, 1 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
|
215 |
working directory now at 471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
216 |
1 changesets pruned |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
217 |
$ hg log --hidden -G |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
218 |
x changeset: 2:0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
219 |
| tag: tip |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
220 |
| user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
221 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2709
5d54de9cf50f
merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2698
diff
changeset
|
222 |
| obsolete: pruned |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
223 |
| summary: B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
224 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
225 |
@ changeset: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
226 |
| user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
227 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
228 |
| summary: A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
229 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
230 |
o changeset: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
231 |
user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
232 |
date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
233 |
summary: ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
234 |
|
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
235 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
236 |
Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
237 |
----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
238 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
239 |
$ hg obslog 'desc(B0)' --hidden --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
240 |
x 0dec01379d3b (2) B0 |
2478
e3ddb534e5d9
test: improve the globing for obsmarker date
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2420
diff
changeset
|
241 |
pruned by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
242 |
(No patch available, no successors) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
243 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
244 |
$ hg obslog 'desc(B0)' --hidden --no-graph -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
|
245 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
246 |
{ |
2957 | 247 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
248 |
{ |
2957 | 249 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
250 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
251 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
252 |
], |
2957 | 253 |
"user": "test", |
254 |
"verb": "pruned" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
255 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
256 |
], |
2957 | 257 |
"node": "0dec01379d3b", |
258 |
"rev": 2, |
|
259 |
"shortdescription": "B0" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
260 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
261 |
] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
262 |
$ hg obslog 'desc(A0)' --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
263 |
@ 471f378eab4c (1) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
264 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
265 |
$ hg obslog 'desc(A0)' --no-graph -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
|
266 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
267 |
{ |
2957 | 268 |
"markers": [], |
269 |
"node": "471f378eab4c", |
|
270 |
"rev": 1, |
|
271 |
"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
|
272 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
273 |
] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
274 |
$ hg up 1 |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
275 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
276 |
$ hg up 0dec01379d3b |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
277 |
abort: hidden revision '0dec01379d3b'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
278 |
(use --hidden to access hidden revisions; pruned) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
279 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
280 |
$ hg up --hidden -r 'desc(B0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
281 |
1 files updated, 0 files merged, 0 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
|
282 |
working directory parent is obsolete! (0dec01379d3b) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
283 |
(use 'hg evolve' to update to its parent successor) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
284 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
285 |
Test output with splitted commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
286 |
================================ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
287 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
288 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
289 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
290 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
291 |
$ hg init $TESTTMP/local-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
292 |
$ cd $TESTTMP/local-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
293 |
$ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
294 |
$ echo 42 >> a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
295 |
$ echo 43 >> b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
296 |
$ 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
|
297 |
adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
298 |
adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
299 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
300 |
@ changeset: 1:471597cad322 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
301 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
302 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
303 |
| 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
|
304 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
305 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
306 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
307 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
308 |
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
|
309 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
310 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
311 |
$ hg split -r 'desc(A0)' -d "0 0" << EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
312 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
313 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
314 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
315 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
316 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
317 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
318 |
> EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
319 |
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
|
320 |
adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
321 |
adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
322 |
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
|
323 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
324 |
examine changes to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
325 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
326 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
327 |
+42 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
328 |
record change 1/2 to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
329 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
330 |
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
|
331 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
332 |
examine changes to 'b'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
333 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
334 |
created new head |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
335 |
Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
336 |
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
|
337 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
338 |
examine changes to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
339 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
340 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
341 |
+43 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
342 |
record this change to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
343 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
344 |
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
|
345 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
346 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
347 |
@ changeset: 3:f257fde29c7a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
348 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
349 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
350 |
| 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
|
351 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
352 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
353 |
o changeset: 2:337fec4d2edc |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
354 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
355 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
356 |
| 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
|
357 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
358 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
359 |
| x changeset: 1:471597cad322 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
360 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
361 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
362 |
| obsolete: 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
|
363 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
364 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
365 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
366 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
367 |
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
|
368 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
369 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
370 |
Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
371 |
----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
372 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
373 |
Check that debugobshistory on splitted commit show both targets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
374 |
$ hg obslog 471597cad322 --hidden --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
375 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
376 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
377 |
(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
|
378 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
379 |
$ hg obslog 471597cad322 --hidden --no-graph -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
|
380 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
381 |
{ |
2957 | 382 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
383 |
{ |
2957 | 384 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
385 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
386 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
387 |
], |
2957 | 388 |
"effect": [ |
389 |
"parent", |
|
390 |
"content" |
|
391 |
], |
|
392 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
393 |
"337fec4d2edc", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
394 |
"f257fde29c7a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
395 |
], |
2957 | 396 |
"user": "test", |
397 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
398 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
399 |
], |
2957 | 400 |
"node": "471597cad322", |
401 |
"rev": 1, |
|
402 |
"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
|
403 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
404 |
] |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
405 |
Check that debugobshistory on the first successor after split show |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
406 |
the revision plus the splitted one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
407 |
$ 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
|
408 |
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
|
409 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
410 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
411 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
412 |
(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
|
413 |
|
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
|
414 |
With the all option, it should show the three changesets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
415 |
$ 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
|
416 |
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
|
417 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
418 |
| @ 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
|
419 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
420 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
421 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
422 |
(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
|
423 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
424 |
Check that debugobshistory on the second successor after split show |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
425 |
the revision plus the splitted one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
426 |
$ 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
|
427 |
@ 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
|
428 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
429 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
430 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
431 |
(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
|
432 |
|
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
|
433 |
With the all option, it should show the three changesets |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
434 |
$ 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
|
435 |
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
|
436 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
437 |
| @ 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
|
438 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
439 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
440 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
441 |
(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
|
442 |
|
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
443 |
Obslog with all option all should also works on the splitted commit |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
444 |
$ hg obslog -a 471597cad322 --hidden --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
|
445 |
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
|
446 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
447 |
| @ 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
|
448 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
449 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
450 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
451 |
(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
|
452 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
453 |
Check that debugobshistory on both successors after split show |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
454 |
a coherent graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
455 |
$ hg obslog 'f257fde29c7a+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
|
456 |
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
|
457 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
458 |
| @ 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
|
459 |
|/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
460 |
x 471597cad322 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
461 |
rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
462 |
(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
|
463 |
|
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
464 |
$ hg update 471597cad322 |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
465 |
abort: hidden revision '471597cad322'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
466 |
(use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
467 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
468 |
$ hg update --hidden 'min(desc(A0))' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
469 |
0 files updated, 0 files merged, 0 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
|
470 |
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
|
471 |
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
472 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
473 |
Test output with lots of splitted commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
474 |
======================================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
475 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
476 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
477 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
478 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
479 |
$ hg init $TESTTMP/local-lots-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
480 |
$ cd $TESTTMP/local-lots-split |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
481 |
$ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
482 |
$ echo 42 >> a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
483 |
$ echo 43 >> b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
484 |
$ echo 44 >> c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
485 |
$ echo 45 >> d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
486 |
$ 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
|
487 |
adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
488 |
adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
489 |
adding c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
490 |
adding d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
491 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
492 |
@ changeset: 1:de7290d8b885 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
493 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
494 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
495 |
| 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
|
496 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
497 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
498 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
499 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
500 |
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
|
501 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
502 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
503 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
504 |
$ hg split -r 'desc(A0)' -d "0 0" << EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
505 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
506 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
507 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
508 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
509 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
510 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
511 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
512 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
513 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
514 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
515 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
516 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
517 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
518 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
519 |
> n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
520 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
521 |
> y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
522 |
> EOF |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
523 |
0 files updated, 0 files merged, 4 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
|
524 |
adding a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
525 |
adding b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
526 |
adding c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
527 |
adding d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
528 |
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
|
529 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
530 |
examine changes to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
531 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
532 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
533 |
+42 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
534 |
record change 1/4 to 'a'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
535 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
536 |
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
|
537 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
538 |
examine changes to 'b'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
539 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
540 |
diff --git a/c b/c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
541 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
542 |
examine changes to 'c'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
543 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
544 |
diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
545 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
546 |
examine changes to 'd'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
547 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
548 |
created new head |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
549 |
Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
550 |
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
|
551 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
552 |
examine changes to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
553 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
554 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
555 |
+43 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
556 |
record change 1/3 to 'b'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
557 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
558 |
diff --git a/c b/c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
559 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
560 |
examine changes to 'c'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
561 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
562 |
diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
563 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
564 |
examine changes to 'd'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
565 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
566 |
Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
567 |
diff --git a/c b/c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
568 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
569 |
examine changes to 'c'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
570 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
571 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
572 |
+44 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
573 |
record change 1/2 to 'c'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
574 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
575 |
diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
576 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
577 |
examine changes to 'd'? [Ynesfdaq?] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
578 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
579 |
Done splitting? [yN] n |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
580 |
diff --git a/d b/d |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
581 |
new file mode 100644 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
582 |
examine changes to 'd'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
583 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
584 |
@@ -0,0 +1,1 @@ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
585 |
+45 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
586 |
record this change to 'd'? [Ynesfdaq?] y |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
587 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
588 |
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
|
589 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
590 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
591 |
@ changeset: 5:c7f044602e9b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
592 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
593 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
594 |
| 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
|
595 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
596 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
597 |
o changeset: 4:1ae8bc733a14 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
598 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
599 |
| 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
|
600 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
601 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
602 |
o changeset: 3:f257fde29c7a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
603 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
604 |
| 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
|
605 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
606 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
607 |
o changeset: 2:337fec4d2edc |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
608 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
609 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
610 |
| 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
|
611 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
612 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
613 |
| x changeset: 1:de7290d8b885 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
614 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
615 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
616 |
| obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
617 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
618 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
619 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
620 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
621 |
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
|
622 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
623 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
624 |
Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
625 |
----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
626 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
627 |
$ hg obslog de7290d8b885 --hidden --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
628 |
x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
629 |
rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
630 |
(No patch available, too many successors (4)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
631 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
632 |
$ hg obslog de7290d8b885 --hidden --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
|
633 |
o 1ae8bc733a14 (4) 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
|
634 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
635 |
| 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
|
636 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
637 |
| @ c7f044602e9b (5) 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
|
638 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
639 |
| o 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
|
640 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
641 |
x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
642 |
rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
643 |
(No patch available, too many successors (4)) |
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
|
644 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
645 |
$ hg obslog de7290d8b885 --hidden --no-graph -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
|
646 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
647 |
{ |
2957 | 648 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
649 |
{ |
2957 | 650 |
"date": [ |
651 |
*, (glob) |
|
652 |
0 (glob) |
|
653 |
], |
|
654 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
655 |
"parent", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
656 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
657 |
], |
2957 | 658 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
659 |
"1ae8bc733a14", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
660 |
"337fec4d2edc", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
661 |
"c7f044602e9b", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
662 |
"f257fde29c7a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
663 |
], |
2957 | 664 |
"user": "test", |
665 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
666 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
667 |
], |
2957 | 668 |
"node": "de7290d8b885", |
669 |
"rev": 1, |
|
670 |
"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
|
671 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
672 |
] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
673 |
$ hg obslog c7f044602e9b --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
674 |
@ c7f044602e9b (5) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
675 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
676 |
x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
677 |
rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
678 |
(No patch available, too many successors (4)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
679 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
680 |
$ hg obslog c7f044602e9b --no-graph -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
|
681 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
682 |
{ |
2957 | 683 |
"markers": [], |
684 |
"node": "c7f044602e9b", |
|
685 |
"rev": 5, |
|
686 |
"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
|
687 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
688 |
{ |
2957 | 689 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
690 |
{ |
2957 | 691 |
"date": [ |
692 |
*, (glob) |
|
693 |
0 (glob) |
|
694 |
], |
|
695 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
696 |
"parent", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
697 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
698 |
], |
2957 | 699 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
700 |
"1ae8bc733a14", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
701 |
"337fec4d2edc", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
702 |
"c7f044602e9b", |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
703 |
"f257fde29c7a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
704 |
], |
2957 | 705 |
"user": "test", |
706 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
707 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
708 |
], |
2957 | 709 |
"node": "de7290d8b885", |
710 |
"rev": 1, |
|
711 |
"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
|
712 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
713 |
] |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
714 |
Check that debugobshistory on all heads show a coherent graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
715 |
$ hg obslog 2::5 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
716 |
o 1ae8bc733a14 (4) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
717 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
718 |
| 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
|
719 |
|/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
720 |
| @ c7f044602e9b (5) A0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
721 |
|/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
722 |
| o 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
|
723 |
|/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
724 |
x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
725 |
rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
726 |
(No patch available, too many successors (4)) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
727 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
728 |
$ hg obslog 5 --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
|
729 |
o 1ae8bc733a14 (4) 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
|
730 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
731 |
| 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
|
732 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
733 |
| @ c7f044602e9b (5) 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
|
734 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
735 |
| o 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
|
736 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
737 |
x de7290d8b885 (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
738 |
rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
739 |
(No patch available, too many successors (4)) |
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
|
740 |
|
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
741 |
$ hg update de7290d8b885 |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
742 |
abort: hidden revision 'de7290d8b885'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
743 |
(use --hidden to access hidden revisions; successors: 337fec4d2edc, f257fde29c7a and 2 more) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
744 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
745 |
$ hg update --hidden 'min(desc(A0))' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
746 |
0 files updated, 0 files merged, 0 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
|
747 |
working directory parent is obsolete! (de7290d8b885) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
748 |
(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a and 2 more) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
749 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
750 |
Test output with folded commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
751 |
============================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
752 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
753 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
754 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
755 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
756 |
$ hg init $TESTTMP/local-fold |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
757 |
$ cd $TESTTMP/local-fold |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
758 |
$ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
759 |
$ mkcommit A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
760 |
$ mkcommit B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
761 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
762 |
@ changeset: 2:0dec01379d3b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
763 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
764 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
765 |
| 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
|
766 |
| summary: B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
767 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
768 |
o changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
769 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
770 |
| 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
|
771 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
772 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
773 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
774 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
775 |
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
|
776 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
777 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
778 |
$ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
779 |
2 changesets folded |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
780 |
0 files updated, 0 files merged, 0 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
|
781 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
782 |
@ changeset: 3:eb5a0daa2192 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
783 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
784 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
785 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
786 |
| 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
|
787 |
| summary: C0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
788 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
789 |
| x changeset: 2:0dec01379d3b |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
790 |
| | user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
791 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
792 |
| | obsolete: rewritten as 3:eb5a0daa2192 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
793 |
| | summary: B0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
794 |
| | |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
795 |
| x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
796 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
797 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
798 |
| obsolete: rewritten as 3:eb5a0daa2192 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
799 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
800 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
801 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
802 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
803 |
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
|
804 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
805 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
806 |
Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
807 |
----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
808 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
809 |
Check that debugobshistory on the first folded revision show only |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
810 |
the revision with the target |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
811 |
$ hg obslog --hidden 471f378eab4c --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
812 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
813 |
rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
814 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
815 |
+++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
816 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
817 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
818 |
+C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
819 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
820 |
diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
821 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
822 |
+++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
823 |
@@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
824 |
+B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
825 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
826 |
|
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
|
827 |
Check that with all option, all changesets are shown |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
828 |
$ hg obslog --hidden --all 471f378eab4c --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
|
829 |
@ eb5a0daa2192 (3) C0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
830 |
|\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
831 |
x | 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
832 |
/ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
833 |
| (No patch available, changesets rebased) |
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
|
834 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
835 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
836 |
rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
837 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
838 |
+++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
839 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
840 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
841 |
+C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
842 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
843 |
diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
844 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
845 |
+++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
846 |
@@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
847 |
+B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
848 |
|
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
|
849 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
850 |
Check that debugobshistory on the second folded revision show only |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
851 |
the revision with the target |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
852 |
$ hg obslog --hidden 0dec01379d3b --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
853 |
x 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
854 |
rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
855 |
(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
|
856 |
|
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
|
857 |
Check that with all option, all changesets are shown |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
858 |
$ hg obslog --hidden --all 0dec01379d3b --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
|
859 |
@ eb5a0daa2192 (3) C0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
860 |
|\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
861 |
x | 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
862 |
/ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
863 |
| (No patch available, changesets rebased) |
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
|
864 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
865 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
866 |
rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
867 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
868 |
+++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
869 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
870 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
871 |
+C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
872 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
873 |
diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
874 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
875 |
+++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
876 |
@@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
877 |
+B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
878 |
|
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
|
879 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
880 |
Check that debugobshistory on the successor revision show a coherent |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
881 |
graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
882 |
$ hg obslog eb5a0daa2192 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
883 |
@ eb5a0daa2192 (3) C0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
884 |
|\ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
885 |
x | 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
886 |
/ rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
887 |
| (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
|
888 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
889 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
890 |
rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
891 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
892 |
+++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
893 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
894 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
895 |
+C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
896 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
897 |
diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
898 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
899 |
+++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
900 |
@@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
901 |
+B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
902 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
903 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
904 |
$ hg obslog eb5a0daa2192 --no-graph -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
|
905 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
906 |
{ |
2957 | 907 |
"markers": [], |
908 |
"node": "eb5a0daa2192", |
|
909 |
"rev": 3, |
|
910 |
"shortdescription": "C0" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
911 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
912 |
{ |
2957 | 913 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
914 |
{ |
2957 | 915 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
916 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
917 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
918 |
], |
2957 | 919 |
"effect": [ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
920 |
"description", |
2957 | 921 |
"content" |
922 |
], |
|
923 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
924 |
"eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
925 |
], |
2957 | 926 |
"user": "test", |
927 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
928 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
929 |
], |
2957 | 930 |
"node": "471f378eab4c", |
931 |
"rev": 1, |
|
932 |
"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
|
933 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
934 |
{ |
2957 | 935 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
936 |
{ |
2957 | 937 |
"date": [ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
938 |
*, (glob) |
2957 | 939 |
0 (glob) |
940 |
], |
|
941 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
942 |
"description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
943 |
"parent", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
944 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
945 |
], |
2957 | 946 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
947 |
"eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
948 |
], |
2957 | 949 |
"user": "test", |
950 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
951 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
952 |
], |
2957 | 953 |
"node": "0dec01379d3b", |
954 |
"rev": 2, |
|
955 |
"shortdescription": "B0" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
956 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
957 |
] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
958 |
$ hg update 471f378eab4c |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
959 |
abort: hidden revision '471f378eab4c'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
960 |
(use --hidden to access hidden revisions; successor: eb5a0daa2192) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
961 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
962 |
$ hg update --hidden 'desc(A0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
963 |
0 files updated, 0 files merged, 1 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
|
964 |
working directory parent is obsolete! (471f378eab4c) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
965 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
966 |
$ hg update 0dec01379d3b |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
967 |
working directory parent is obsolete! (471f378eab4c) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
968 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
969 |
abort: hidden revision '0dec01379d3b'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
970 |
(use --hidden to access hidden revisions; successor: eb5a0daa2192) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
971 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
972 |
$ hg update --hidden 'desc(B0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
973 |
1 files updated, 0 files merged, 0 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
|
974 |
working directory parent is obsolete! (0dec01379d3b) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
975 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
976 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
977 |
Test output with divergence |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
978 |
=========================== |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
979 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
980 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
981 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
982 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
983 |
$ hg init $TESTTMP/local-divergence |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
984 |
$ cd $TESTTMP/local-divergence |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
985 |
$ mkcommit ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
986 |
$ mkcommit A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
987 |
$ hg amend -m "A1" |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
988 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
989 |
@ changeset: 2:fdf9bde5129a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
990 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
991 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
992 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
993 |
| 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
|
994 |
| summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
995 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
996 |
| x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
997 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
998 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
999 |
| obsolete: reworded using amend as 2:fdf9bde5129a |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1000 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1001 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1002 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1003 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1004 |
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
|
1005 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1006 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1007 |
$ hg update --hidden 'desc(A0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1008 |
0 files updated, 0 files merged, 0 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
|
1009 |
working directory parent is obsolete! (471f378eab4c) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1010 |
(use 'hg evolve' to update to its successor: fdf9bde5129a) |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1011 |
$ hg amend -m "A2" |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1012 |
2 new content-divergent changesets |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1013 |
$ hg log --hidden -G |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1014 |
@ changeset: 3:65b757b745b9 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1015 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1016 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1017 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1018 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1019 |
| instability: content-divergent |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1020 |
| summary: A2 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1021 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1022 |
| o changeset: 2:fdf9bde5129a |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1023 |
|/ parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1024 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1025 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1026 |
| instability: content-divergent |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1027 |
| summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1028 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1029 |
| x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1030 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1031 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1032 |
| obsolete: reworded using amend as 2:fdf9bde5129a |
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1033 |
| obsolete: reworded using amend as 3:65b757b745b9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1034 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1035 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1036 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1037 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1038 |
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
|
1039 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1040 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1041 |
Actual test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1042 |
----------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1043 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1044 |
Check that debugobshistory on the divergent revision show both destinations |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1045 |
$ hg obslog --hidden 471f378eab4c --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1046 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1047 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1048 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1049 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1050 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1051 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1052 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1053 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1054 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1055 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1056 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1057 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1058 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1059 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1060 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1061 |
|
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
|
1062 |
|
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1063 |
Check that with all option, every changeset is shown |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1064 |
$ hg obslog --hidden --all 471f378eab4c --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
|
1065 |
@ 65b757b745b9 (3) A2 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1066 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1067 |
| o fdf9bde5129a (2) A1 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1068 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1069 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1070 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1071 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1072 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1073 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1074 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1075 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1076 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1077 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1078 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1079 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1080 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1081 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1082 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1083 |
|
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
|
1084 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
1085 |
$ hg obslog --hidden 471f378eab4c --no-graph -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
|
1086 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1087 |
{ |
2957 | 1088 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1089 |
{ |
2957 | 1090 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1091 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1092 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1093 |
], |
2957 | 1094 |
"effect": [ |
1095 |
"description" |
|
1096 |
], |
|
1097 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1098 |
"65b757b745b9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1099 |
], |
2957 | 1100 |
"user": "test", |
1101 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1102 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1103 |
{ |
2957 | 1104 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1105 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1106 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1107 |
], |
2957 | 1108 |
"effect": [ |
1109 |
"description" |
|
1110 |
], |
|
1111 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1112 |
"fdf9bde5129a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1113 |
], |
2957 | 1114 |
"user": "test", |
1115 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1116 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1117 |
], |
2957 | 1118 |
"node": "471f378eab4c", |
1119 |
"rev": 1, |
|
1120 |
"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
|
1121 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1122 |
] |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1123 |
Check that debugobshistory on the first diverged revision show the revision |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1124 |
and the diverent one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1125 |
$ hg obslog fdf9bde5129a --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1126 |
o fdf9bde5129a (2) A1 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1127 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1128 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1129 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1130 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1131 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1132 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1133 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1134 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1135 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1136 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1137 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1138 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1139 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1140 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1141 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1142 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1143 |
|
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
|
1144 |
|
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1145 |
Check that all option show all of them |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1146 |
$ hg obslog fdf9bde5129a -a --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
|
1147 |
@ 65b757b745b9 (3) A2 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1148 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1149 |
| o fdf9bde5129a (2) A1 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1150 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1151 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1152 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1153 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1154 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1155 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1156 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1157 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1158 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1159 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1160 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1161 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1162 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1163 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1164 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1165 |
|
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
|
1166 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1167 |
Check that debugobshistory on the second diverged revision show the revision |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1168 |
and the diverent one |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1169 |
$ hg obslog 65b757b745b9 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1170 |
@ 65b757b745b9 (3) A2 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1171 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1172 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1173 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1174 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1175 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1176 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1177 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1178 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1179 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1180 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1181 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1182 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1183 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1184 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1185 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1186 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1187 |
|
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
|
1188 |
Check that all option show all of them |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1189 |
$ hg obslog 65b757b745b9 -a --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
|
1190 |
@ 65b757b745b9 (3) A2 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1191 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1192 |
| o fdf9bde5129a (2) A1 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1193 |
|/ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1194 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1195 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1196 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1197 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1198 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1199 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1200 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1201 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1202 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1203 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1204 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1205 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1206 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1207 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1208 |
|
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
|
1209 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1210 |
Check that debugobshistory on the both diverged revision show a coherent |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1211 |
graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1212 |
$ hg obslog '65b757b745b9+fdf9bde5129a' --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1213 |
@ 65b757b745b9 (3) A2 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1214 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1215 |
| o fdf9bde5129a (2) A1 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1216 |
|/ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1217 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1218 |
rewritten(description) as 65b757b745b9 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1219 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1220 |
+++ b/65b757b745b9-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1221 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1222 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1223 |
+A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1224 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1225 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1226 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1227 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1228 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1229 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1230 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1231 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1232 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
1233 |
$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -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
|
1234 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1235 |
{ |
2957 | 1236 |
"markers": [], |
1237 |
"node": "65b757b745b9", |
|
1238 |
"rev": 3, |
|
1239 |
"shortdescription": "A2" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1240 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1241 |
{ |
2957 | 1242 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1243 |
{ |
2957 | 1244 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1245 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1246 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1247 |
], |
2957 | 1248 |
"effect": [ |
1249 |
"description" |
|
1250 |
], |
|
1251 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1252 |
"65b757b745b9" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1253 |
], |
2957 | 1254 |
"user": "test", |
1255 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1256 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1257 |
{ |
2957 | 1258 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1259 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1260 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1261 |
], |
2957 | 1262 |
"effect": [ |
1263 |
"description" |
|
1264 |
], |
|
1265 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1266 |
"fdf9bde5129a" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1267 |
], |
2957 | 1268 |
"user": "test", |
1269 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1270 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1271 |
], |
2957 | 1272 |
"node": "471f378eab4c", |
1273 |
"rev": 1, |
|
1274 |
"shortdescription": "A0" |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1275 |
}, |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1276 |
{ |
2957 | 1277 |
"markers": [], |
1278 |
"node": "fdf9bde5129a", |
|
1279 |
"rev": 2, |
|
1280 |
"shortdescription": "A1" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1281 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1282 |
] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1283 |
$ hg update 471f378eab4c |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1284 |
abort: hidden revision '471f378eab4c'! |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1285 |
(use --hidden to access hidden revisions; diverged) |
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
1286 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1287 |
$ hg update --hidden 'desc(A0)' |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1288 |
0 files updated, 0 files merged, 0 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
|
1289 |
working directory parent is obsolete! (471f378eab4c) |
3154
406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3115
diff
changeset
|
1290 |
(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1291 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1292 |
Test output with amended + folded commit |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1293 |
======================================== |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1294 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1295 |
Test setup |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1296 |
---------- |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1297 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1298 |
$ hg init $TESTTMP/local-amend-fold |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1299 |
$ cd $TESTTMP/local-amend-fold |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1300 |
$ mkcommit ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1301 |
$ mkcommit A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1302 |
$ mkcommit B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1303 |
$ hg amend -m "B1" |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1304 |
$ hg log --hidden -G |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1305 |
@ changeset: 3:b7ea6d14e664 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1306 |
| tag: tip |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1307 |
| parent: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1308 |
| user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1309 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1310 |
| summary: B1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1311 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1312 |
| x changeset: 2:0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1313 |
|/ user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1314 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1315 |
| obsolete: reworded using amend as 3:b7ea6d14e664 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1316 |
| summary: B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1317 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1318 |
o changeset: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1319 |
| user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1320 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1321 |
| summary: A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1322 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1323 |
o changeset: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1324 |
user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1325 |
date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1326 |
summary: ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1327 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1328 |
$ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0" |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1329 |
2 changesets folded |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1330 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1331 |
$ hg log --hidden -G |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1332 |
@ changeset: 4:eb5a0daa2192 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1333 |
| tag: tip |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1334 |
| parent: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1335 |
| user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1336 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1337 |
| summary: C0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1338 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1339 |
| x changeset: 3:b7ea6d14e664 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1340 |
| | parent: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1341 |
| | user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1342 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
1343 |
| | obsolete: rewritten as 4:eb5a0daa2192 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1344 |
| | summary: B1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1345 |
| | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1346 |
| | x changeset: 2:0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1347 |
| |/ user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1348 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1349 |
| | obsolete: reworded using amend as 3:b7ea6d14e664 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1350 |
| | summary: B0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1351 |
| | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1352 |
| x changeset: 1:471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1353 |
|/ user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1354 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3083
e91ca8b5ecf7
obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3075
diff
changeset
|
1355 |
| obsolete: rewritten as 4:eb5a0daa2192 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1356 |
| summary: A0 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1357 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1358 |
o changeset: 0:ea207398892e |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1359 |
user: test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1360 |
date: Thu Jan 01 00:00:00 1970 +0000 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1361 |
summary: ROOT |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1362 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1363 |
Actual test |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1364 |
----------- |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1365 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1366 |
Check that debugobshistory on head show a coherent graph |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1367 |
$ hg obslog eb5a0daa2192 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1368 |
@ eb5a0daa2192 (4) C0 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1369 |
|\ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1370 |
x | 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1371 |
/ rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1372 |
| --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1373 |
| +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1374 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1375 |
| -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1376 |
| +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1377 |
| |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1378 |
| diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1379 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1380 |
| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1381 |
| @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1382 |
| +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1383 |
| |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1384 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1385 |
x b7ea6d14e664 (3) B1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1386 |
| rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1387 |
| (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
|
1388 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1389 |
x 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1390 |
rewritten(description) as b7ea6d14e664 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1391 |
--- a/0dec01379d3b-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1392 |
+++ b/b7ea6d14e664-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1393 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1394 |
-B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1395 |
+B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1396 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1397 |
|
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
|
1398 |
Check that obslog on ROOT with all option show everything |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1399 |
$ hg obslog 1 --hidden --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
|
1400 |
@ eb5a0daa2192 (4) C0 |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1401 |
|\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1402 |
x | 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1403 |
/ rewritten(description, content) as eb5a0daa2192 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1404 |
| --- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1405 |
| +++ b/eb5a0daa2192-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1406 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1407 |
| -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1408 |
| +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1409 |
| |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1410 |
| diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1411 |
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1412 |
| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1413 |
| @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1414 |
| +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1415 |
| |
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
|
1416 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1417 |
x b7ea6d14e664 (3) B1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1418 |
| rewritten(description, parent, content) as eb5a0daa2192 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1419 |
| (No patch available, changesets rebased) |
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
|
1420 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
1421 |
x 0dec01379d3b (2) B0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1422 |
rewritten(description) as b7ea6d14e664 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1423 |
--- a/0dec01379d3b-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1424 |
+++ b/b7ea6d14e664-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1425 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1426 |
-B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1427 |
+B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1428 |
|
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
|
1429 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
1430 |
$ hg obslog eb5a0daa2192 --no-graph -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
|
1431 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1432 |
{ |
2957 | 1433 |
"markers": [], |
1434 |
"node": "eb5a0daa2192", |
|
1435 |
"rev": 4, |
|
1436 |
"shortdescription": "C0" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1437 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1438 |
{ |
2957 | 1439 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1440 |
{ |
2957 | 1441 |
"date": [ |
1442 |
*, (glob) |
|
1443 |
0 (glob) |
|
1444 |
], |
|
1445 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1446 |
*, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1447 |
*, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1448 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1449 |
], |
2957 | 1450 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1451 |
"eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1452 |
], |
2957 | 1453 |
"user": "test", |
1454 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1455 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1456 |
], |
2957 | 1457 |
"node": "b7ea6d14e664", |
1458 |
"rev": 3, |
|
1459 |
"shortdescription": "B1" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1460 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1461 |
{ |
2957 | 1462 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1463 |
{ |
2957 | 1464 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1465 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1466 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1467 |
], |
2957 | 1468 |
"effect": [ |
1469 |
"description" |
|
1470 |
], |
|
1471 |
"succnodes": [ |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1472 |
"b7ea6d14e664" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1473 |
], |
2957 | 1474 |
"user": "test", |
1475 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1476 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1477 |
], |
2957 | 1478 |
"node": "0dec01379d3b", |
1479 |
"rev": 2, |
|
1480 |
"shortdescription": "B0" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1481 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1482 |
{ |
2957 | 1483 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1484 |
{ |
2957 | 1485 |
"date": [ |
1486 |
*, (glob) |
|
1487 |
0 (glob) |
|
1488 |
], |
|
1489 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1490 |
"description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1491 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
1492 |
], |
2957 | 1493 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1494 |
"eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1495 |
], |
2957 | 1496 |
"user": "test", |
1497 |
"verb": "rewritten" |
|
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1498 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1499 |
], |
2957 | 1500 |
"node": "471f378eab4c", |
1501 |
"rev": 1, |
|
1502 |
"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
|
1503 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
1504 |
] |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1505 |
$ hg update 471f378eab4c |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1506 |
abort: hidden revision '471f378eab4c'! |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1507 |
(use --hidden to access hidden revisions; successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1508 |
[255] |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1509 |
$ hg update --hidden 'desc(A0)' |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1510 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1511 |
working directory parent is obsolete! (471f378eab4c) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1512 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1513 |
$ hg update --hidden 0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1514 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1515 |
working directory parent is obsolete! (0dec01379d3b) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1516 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1517 |
$ hg update 0dec01379d3b |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1518 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1519 |
working directory parent is obsolete! (0dec01379d3b) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1520 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1521 |
$ hg update --hidden 'desc(B0)' |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1522 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1523 |
working directory parent is obsolete! (0dec01379d3b) |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
1524 |
(use 'hg evolve' to update to its successor: eb5a0daa2192) |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1525 |
|
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1526 |
Test output with pushed and pulled obs markers |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1527 |
============================================== |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1528 |
|
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1529 |
Test setup |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1530 |
---------- |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1531 |
|
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1532 |
$ hg init $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1533 |
$ cd $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1534 |
$ mkcommit ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1535 |
$ mkcommit A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1536 |
$ hg log --hidden -G |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1537 |
@ changeset: 1:471f378eab4c |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1538 |
| tag: tip |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1539 |
| user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1540 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1541 |
| summary: A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1542 |
| |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1543 |
o changeset: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1544 |
user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1545 |
date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1546 |
summary: ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1547 |
|
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1548 |
$ hg clone $TESTTMP/local-remote-markers-1 $TESTTMP/local-remote-markers-2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1549 |
updating to branch default |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1550 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1551 |
$ cd $TESTTMP/local-remote-markers-2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1552 |
$ hg log --hidden -G |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1553 |
@ changeset: 1:471f378eab4c |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1554 |
| tag: tip |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1555 |
| user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1556 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1557 |
| summary: A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1558 |
| |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1559 |
o changeset: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1560 |
user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1561 |
date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1562 |
summary: ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1563 |
|
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1564 |
$ cd $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1565 |
$ hg amend -m "A1" |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1566 |
$ hg amend -m "A2" |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1567 |
$ hg log --hidden -G |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1568 |
@ changeset: 3:7a230b46bf61 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1569 |
| tag: tip |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1570 |
| parent: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1571 |
| user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1572 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1573 |
| summary: A2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1574 |
| |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1575 |
| x changeset: 2:fdf9bde5129a |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1576 |
|/ parent: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1577 |
| user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1578 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1579 |
| obsolete: reworded using amend as 3:7a230b46bf61 |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1580 |
| summary: A1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1581 |
| |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1582 |
| x changeset: 1:471f378eab4c |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1583 |
|/ user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1584 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3115
663dbef40f97
obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3083
diff
changeset
|
1585 |
| obsolete: reworded using amend as 2:fdf9bde5129a |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1586 |
| summary: A0 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1587 |
| |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1588 |
o changeset: 0:ea207398892e |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1589 |
user: test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1590 |
date: Thu Jan 01 00:00:00 1970 +0000 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1591 |
summary: ROOT |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1592 |
|
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1593 |
Actual test |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1594 |
----------- |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1595 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1596 |
$ hg obslog 7a230b46bf61 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1597 |
@ 7a230b46bf61 (3) A2 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1598 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1599 |
x fdf9bde5129a (2) A1 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1600 |
| rewritten(description) as 7a230b46bf61 by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1601 |
| --- a/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1602 |
| +++ b/7a230b46bf61-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1603 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1604 |
| -A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1605 |
| +A2 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1606 |
| |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1607 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1608 |
x 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1609 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1610 |
--- a/471f378eab4c-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1611 |
+++ b/fdf9bde5129a-changeset-description |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1612 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1613 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1614 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
1615 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1616 |
|
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1617 |
$ cd $TESTTMP/local-remote-markers-2 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1618 |
$ hg pull |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1619 |
pulling from $TESTTMP/local-remote-markers-1 |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1620 |
searching for changes |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1621 |
adding changesets |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1622 |
adding manifests |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1623 |
adding file changes |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1624 |
added 1 changesets with 0 changes to 1 files (+1 heads) |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1625 |
2 new obsolescence markers |
2710
e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2709
diff
changeset
|
1626 |
obsoleted 1 changesets |
3075
8feb2cae7eae
test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3055
diff
changeset
|
1627 |
new changesets 7a230b46bf61 |
2349
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1628 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1629 |
working directory parent is obsolete! (471f378eab4c) |
521a18a10a06
obshistory: display a message when one marker node has no change ctx
Boris Feld <boris.feld@octobus.net>
parents:
2342
diff
changeset
|
1630 |
(use 'hg evolve' to update to its successor: 7a230b46bf61) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1631 |
Check that debugobshistory works with markers pointing to missing local |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1632 |
changectx |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1633 |
$ hg obslog 7a230b46bf61 --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1634 |
o 7a230b46bf61 (2) A2 |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1635 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1636 |
x fdf9bde5129a |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1637 |
| rewritten(description) as 7a230b46bf61 by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1638 |
| (No patch available, context is not local) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1639 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1640 |
@ 471f378eab4c (1) A0 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1641 |
rewritten(description) as fdf9bde5129a by test (*) (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1642 |
(No patch available, successor is unknown locally) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1643 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
1644 |
$ hg obslog 7a230b46bf61 --color=debug --patch |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1645 |
o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1646 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1647 |
x [evolve.node evolve.missing_change_ctx|fdf9bde5129a] |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1648 |
| [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(*)] (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1649 |
| (No patch available, context is not local) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1650 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1651 |
@ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
1652 |
[evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(*)] (glob) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
1653 |
(No patch available, successor is unknown locally) |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
1654 |