author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Wed, 24 Apr 2019 14:38:26 +0200 | |
changeset 4574 | 5e8c47c553db |
parent 3892 | 106c871dfebc |
child 3909 | f7afd3a158e3 |
child 4918 | f16274729530 |
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 |
|
3885
3df8b6ecce2a
tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
3884
diff
changeset
|
7 |
$ . $TESTDIR/testlib/obshistory_setup.sh |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
|
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
9 |
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
|
10 |
======================================== |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
11 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
12 |
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
|
13 |
---------- |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
14 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
15 |
$ 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
|
16 |
$ 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
|
17 |
$ 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
|
18 |
$ 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
|
19 |
$ 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
|
20 |
$ 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
|
21 |
$ 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
|
22 |
@ 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
|
23 |
| 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
|
24 |
| 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
|
25 |
| 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
|
26 |
| 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
|
27 |
| 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
|
28 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
29 |
| 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
|
30 |
|/ 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
|
31 |
| 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
|
32 |
| 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
|
33 |
| 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
|
34 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
35 |
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
|
36 |
| 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
|
37 |
| 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
|
38 |
| 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
|
39 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
40 |
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
|
41 |
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
|
42 |
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
|
43 |
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
|
44 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
45 |
$ 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
|
46 |
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
|
47 |
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
|
48 |
$ 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
|
49 |
@ 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
|
50 |
| 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
|
51 |
| 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
|
52 |
| 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
|
53 |
| 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
|
54 |
| 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
|
55 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
56 |
| 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
|
57 |
| | 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
|
58 |
| | 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
|
59 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
60 |
| | obsolete: rewritten using fold 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
|
61 |
| | 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
|
62 |
| | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
63 |
| | 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
|
64 |
| |/ 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
|
65 |
| | 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
|
66 |
| | 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
|
67 |
| | 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
|
68 |
| | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
69 |
| 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
|
70 |
|/ 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
|
71 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
72 |
| obsolete: rewritten using fold 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
|
73 |
| 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
|
74 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
75 |
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
|
76 |
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
|
77 |
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
|
78 |
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
|
79 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
80 |
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
|
81 |
----------- |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
82 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
83 |
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
|
84 |
$ 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
|
85 |
@ 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
|
86 |
|\ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
87 |
x | 471f378eab4c (1) A0 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
88 |
/ rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
3400
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
89 |
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
90 |
| --- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
91 |
| +++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
92 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
93 |
| -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
94 |
| +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
95 |
| |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
96 |
| diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
97 |
| --- /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
|
98 |
| +++ 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
|
99 |
| @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
100 |
| +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
101 |
| |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
102 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
103 |
x b7ea6d14e664 (3) B1 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
104 |
| rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
105 |
| (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
|
106 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
107 |
x 0dec01379d3b (2) B0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3519
diff
changeset
|
108 |
rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3400
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
109 |
diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
110 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
111 |
+++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
112 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
113 |
-B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
114 |
+B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
115 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
116 |
|
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
|
117 |
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
|
118 |
$ 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
|
119 |
@ 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
|
120 |
|\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
121 |
x | 471f378eab4c (1) A0 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
122 |
/ rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
3400
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
123 |
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
124 |
| --- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
125 |
| +++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
126 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
127 |
| -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
128 |
| +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
129 |
| |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
130 |
| diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
131 |
| --- /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
|
132 |
| +++ 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
|
133 |
| @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
134 |
| +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
135 |
| |
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
|
136 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
137 |
x b7ea6d14e664 (3) B1 |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
138 |
| rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
3055
774b4ea6ca58
obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3054
diff
changeset
|
139 |
| (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
|
140 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
141 |
x 0dec01379d3b (2) B0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3519
diff
changeset
|
142 |
rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3400
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
143 |
diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
144 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
145 |
+++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
146 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
147 |
-B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
148 |
+B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
149 |
|
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
|
150 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
151 |
$ 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
|
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": [], |
155 |
"node": "eb5a0daa2192", |
|
156 |
"rev": 4, |
|
157 |
"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
|
158 |
}, |
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 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
161 |
{ |
2957 | 162 |
"date": [ |
163 |
*, (glob) |
|
164 |
0 (glob) |
|
165 |
], |
|
166 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
167 |
*, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
168 |
*, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
169 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
170 |
], |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
171 |
"operation": "fold", |
2957 | 172 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
173 |
"eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
174 |
], |
2957 | 175 |
"user": "test", |
176 |
"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
|
177 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
178 |
], |
2957 | 179 |
"node": "b7ea6d14e664", |
180 |
"rev": 3, |
|
181 |
"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
|
182 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
183 |
{ |
2957 | 184 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
185 |
{ |
2957 | 186 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
187 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
188 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
189 |
], |
2957 | 190 |
"effect": [ |
191 |
"description" |
|
192 |
], |
|
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3432
diff
changeset
|
193 |
"operation": "amend", |
2957 | 194 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
195 |
"b7ea6d14e664" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
196 |
], |
2957 | 197 |
"user": "test", |
198 |
"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
|
199 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
200 |
], |
2957 | 201 |
"node": "0dec01379d3b", |
202 |
"rev": 2, |
|
203 |
"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
|
204 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
205 |
{ |
2957 | 206 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
207 |
{ |
2957 | 208 |
"date": [ |
209 |
*, (glob) |
|
210 |
0 (glob) |
|
211 |
], |
|
212 |
"effect": [ |
|
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
213 |
"description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
214 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
215 |
], |
3564
589649021ea1
fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3559
diff
changeset
|
216 |
"operation": "fold", |
2957 | 217 |
"succnodes": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
218 |
"eb5a0daa2192" |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
219 |
], |
2957 | 220 |
"user": "test", |
221 |
"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
|
222 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
223 |
], |
2957 | 224 |
"node": "471f378eab4c", |
225 |
"rev": 1, |
|
226 |
"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
|
227 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
228 |
] |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
229 |
$ hg update 471f378eab4c |
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
230 |
abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192! |
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
231 |
(use --hidden to access hidden revisions) |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
232 |
[255] |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
233 |
$ hg update --hidden 'desc(A0)' |
3747
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
234 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
235 |
updated to hidden changeset 471f378eab4c |
3432
f57be161f34b
test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3417
diff
changeset
|
236 |
(hidden revision '471f378eab4c' was rewritten as: 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
|
237 |
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
|
238 |
(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
|
239 |
$ hg update --hidden 0dec01379d3b |
3747
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
240 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
241 |
updated to hidden changeset 0dec01379d3b |
3432
f57be161f34b
test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3417
diff
changeset
|
242 |
(hidden revision '0dec01379d3b' was rewritten as: 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
|
243 |
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
|
244 |
(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
|
245 |
$ 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
|
246 |
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
|
247 |
$ 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
|
248 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |