author | Anton Shestakov <av6@dwimlabs.net> |
Fri, 08 May 2020 18:46:20 +0800 | |
branch | stable |
changeset 5356 | d3a0af422f43 |
parent 5349 | e8660b28bfee |
child 5367 | cb5983c0287f |
permissions | -rw-r--r-- |
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5262
diff
changeset
|
1 |
Testing obslog and other commands accessing obsolete revisions. |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 |
Global setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
============ |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 |
|
3885
3df8b6ecce2a
tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents:
3884
diff
changeset
|
6 |
$ . $TESTDIR/testlib/obshistory_setup.sh |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 |
|
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
8 |
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
|
9 |
======================================== |
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 |
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
|
12 |
---------- |
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 |
$ 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
|
15 |
$ 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
|
16 |
$ 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
|
17 |
$ 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
|
18 |
$ 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
|
19 |
$ 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
|
20 |
$ 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
|
21 |
@ 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
|
22 |
| 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
|
23 |
| 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
|
24 |
| 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
|
25 |
| 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
|
26 |
| 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
|
27 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
28 |
| 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
|
29 |
|/ 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
|
30 |
| 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
|
31 |
| 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
|
32 |
| 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
|
33 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
34 |
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
|
35 |
| 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
|
36 |
| 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
|
37 |
| 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
|
38 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
39 |
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
|
40 |
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
|
41 |
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
|
42 |
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
|
43 |
|
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
44 |
$ 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
|
45 |
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
|
46 |
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
|
47 |
$ 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
|
48 |
@ 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
|
49 |
| 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
|
50 |
| 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
|
51 |
| 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
|
52 |
| 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
|
53 |
| 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
|
54 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
55 |
| 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
|
56 |
| | 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
|
57 |
| | 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
|
58 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
5115
f44cc9abf21c
obshistory: add 'folded' to the list of precise verbs
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
59 |
| | obsolete: folded 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
|
60 |
| | 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
|
61 |
| | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
62 |
| | 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
|
63 |
| |/ 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
|
64 |
| | 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
|
65 |
| | 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
|
66 |
| | 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
|
67 |
| | |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
68 |
| 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
|
69 |
|/ 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
|
70 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
5115
f44cc9abf21c
obshistory: add 'folded' to the list of precise verbs
Anton Shestakov <av6@dwimlabs.net>
parents:
4983
diff
changeset
|
71 |
| obsolete: folded 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
|
72 |
| 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
|
73 |
| |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
74 |
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
|
75 |
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
|
76 |
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
|
77 |
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
|
78 |
|
5215
3d7cd43d591a
tests: unindent lines that only have one leading space
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
79 |
Actual test |
3d7cd43d591a
tests: unindent lines that only have one leading space
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
80 |
----------- |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
81 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5262
diff
changeset
|
82 |
Check that obslog on head shows a coherent graph |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
83 |
$ hg obslog eb5a0daa2192 --patch --no-origin |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
84 |
@ 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
|
85 |
|\ |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
86 |
x | 471f378eab4c (1) A0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
87 |
/ folded(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
|
88 |
| 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
|
89 |
| --- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
90 |
| +++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
91 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
92 |
| -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
93 |
| +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
94 |
| |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
95 |
| diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
96 |
| --- /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
|
97 |
| +++ 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
|
98 |
| @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
99 |
| +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
100 |
| |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
101 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
102 |
x b7ea6d14e664 (3) B1 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
103 |
| folded(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
|
104 |
| (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
|
105 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
106 |
x 0dec01379d3b (2) B0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
107 |
reworded(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
|
108 |
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
|
109 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
110 |
+++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
111 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
112 |
-B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
113 |
+B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
114 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
115 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
116 |
$ hg obslog eb5a0daa2192 --patch |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
117 |
@ eb5a0daa2192 (4) C0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
118 |
|\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
119 |
| | (No patch available, too many predecessors (2)) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
120 |
| | |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
121 |
x | 471f378eab4c (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
122 |
/ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
123 |
x b7ea6d14e664 (3) B1 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
124 |
| reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
125 |
| diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
126 |
| --- a/changeset-description |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
127 |
| +++ b/changeset-description |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
128 |
| @@ -1,1 +1,1 @@ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
129 |
| -B0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
130 |
| +B1 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
131 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
132 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
133 |
x 0dec01379d3b (2) B0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
134 |
|
5339
258c0a99c5b0
tests: update section headers and comments in obslog-related tests
Anton Shestakov <av6@dwimlabs.net>
parents:
5262
diff
changeset
|
135 |
Check that obslog on A0 with all option shows everything |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
136 |
$ hg obslog 1 --hidden --all --patch --no-origin |
2484
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
137 |
@ 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
|
138 |
|\ |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
139 |
x | 471f378eab4c (1) A0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
140 |
/ folded(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
|
141 |
| 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
|
142 |
| --- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
143 |
| +++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
144 |
| @@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
145 |
| -A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
146 |
| +C0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
147 |
| |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
148 |
| diff -r 471f378eab4c -r eb5a0daa2192 B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
149 |
| --- /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
|
150 |
| +++ 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
|
151 |
| @@ -0,0 +1,1 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
152 |
| +B0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
153 |
| |
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
|
154 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
155 |
x b7ea6d14e664 (3) B1 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
156 |
| folded(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
|
157 |
| (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
|
158 |
| |
262d684851dc
obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
2483
diff
changeset
|
159 |
x 0dec01379d3b (2) B0 |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
160 |
reworded(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
|
161 |
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
|
162 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
163 |
+++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
164 |
@@ -1,1 +1,1 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
165 |
-B0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
166 |
+B1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
167 |
|
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
|
168 |
|
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
169 |
$ hg obslog 1 --hidden --all --patch |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
170 |
@ eb5a0daa2192 (4) C0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
171 |
|\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
172 |
| | (No patch available, too many predecessors (2)) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
173 |
| | |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
174 |
x | 471f378eab4c (1) A0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
175 |
/ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
176 |
x b7ea6d14e664 (3) B1 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
177 |
| reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
178 |
| diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
179 |
| --- a/changeset-description |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
180 |
| +++ b/changeset-description |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
181 |
| @@ -1,1 +1,1 @@ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
182 |
| -B0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
183 |
| +B1 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
184 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
185 |
| |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
186 |
x 0dec01379d3b (2) B0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
187 |
|
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
188 |
$ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | python -m json.tool |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
189 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
190 |
{ |
2957 | 191 |
"markers": [], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
192 |
"node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", |
2957 | 193 |
"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
|
194 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
195 |
{ |
2957 | 196 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
197 |
{ |
5171
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
198 |
"dates": [ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
199 |
[ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
200 |
*, (glob) |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
201 |
0 |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
202 |
] |
2957 | 203 |
], |
4939
7aba58dc4b73
obslog: use plural name "effects" for list of all effects
Martin von Zweigbergk <martinvonz@google.com>
parents:
4918
diff
changeset
|
204 |
"effects": [ |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
205 |
*, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
206 |
*, (glob) |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
207 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
208 |
], |
5169
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
209 |
"operations": [ |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
210 |
"fold" |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
211 |
], |
2957 | 212 |
"succnodes": [ |
4951
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
213 |
"eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
214 |
], |
5168
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
215 |
"users": [ |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
216 |
"test" |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
217 |
], |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
218 |
"verb": "folded" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
219 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
220 |
], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
221 |
"node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", |
2957 | 222 |
"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
|
223 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
224 |
{ |
2957 | 225 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
226 |
{ |
5171
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
227 |
"dates": [ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
228 |
[ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
229 |
*, (glob) |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
230 |
0 |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
231 |
] |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
232 |
], |
4939
7aba58dc4b73
obslog: use plural name "effects" for list of all effects
Martin von Zweigbergk <martinvonz@google.com>
parents:
4918
diff
changeset
|
233 |
"effects": [ |
2957 | 234 |
"description" |
235 |
], |
|
5169
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
236 |
"operations": [ |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
237 |
"amend" |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
238 |
], |
2957 | 239 |
"succnodes": [ |
4951
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
240 |
"b7ea6d14e664bdc8922221f7992631b50da3fb07" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
241 |
], |
5168
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
242 |
"users": [ |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
243 |
"test" |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
244 |
], |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
245 |
"verb": "reworded" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
246 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
247 |
], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
248 |
"node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", |
2957 | 249 |
"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
|
250 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
251 |
{ |
2957 | 252 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
253 |
{ |
5171
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
254 |
"dates": [ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
255 |
[ |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
256 |
*, (glob) |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
257 |
0 |
7f7f40cc6c9b
obslog: make date template property into dates
Anton Shestakov <av6@dwimlabs.net>
parents:
5169
diff
changeset
|
258 |
] |
2957 | 259 |
], |
4939
7aba58dc4b73
obslog: use plural name "effects" for list of all effects
Martin von Zweigbergk <martinvonz@google.com>
parents:
4918
diff
changeset
|
260 |
"effects": [ |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
261 |
"description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
262 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
263 |
], |
5169
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
264 |
"operations": [ |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
265 |
"fold" |
897b371cd0c5
obslog: make operation template property into operations
Anton Shestakov <av6@dwimlabs.net>
parents:
5168
diff
changeset
|
266 |
], |
2957 | 267 |
"succnodes": [ |
4951
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
268 |
"eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
269 |
], |
5168
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
270 |
"users": [ |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
271 |
"test" |
c7ca43bba6c5
obslog: make user template property into users
Anton Shestakov <av6@dwimlabs.net>
parents:
5125
diff
changeset
|
272 |
], |
5123
900668a93629
obslog: use _successorsetverb() in regular obslog too
Anton Shestakov <av6@dwimlabs.net>
parents:
5115
diff
changeset
|
273 |
"verb": "folded" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
274 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
275 |
], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
276 |
"node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
2957 | 277 |
"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
|
278 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
279 |
] |
5349
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
280 |
$ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
281 |
[ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
282 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
283 |
"markers": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
284 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
285 |
"dates": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
286 |
[ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
287 |
*, (glob) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
288 |
0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
289 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
290 |
[ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
291 |
*, (glob) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
292 |
0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
293 |
] |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
294 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
295 |
"effects": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
296 |
*, (glob) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
297 |
*, (glob) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
298 |
"content" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
299 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
300 |
"operations": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
301 |
"fold" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
302 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
303 |
"prednodes": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
304 |
"471f378eab4c5e25f6c77f785b27c936efb22874", |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
305 |
"b7ea6d14e664bdc8922221f7992631b50da3fb07" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
306 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
307 |
"users": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
308 |
"test" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
309 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
310 |
"verb": "folded" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
311 |
} |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
312 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
313 |
"node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
314 |
"shortdescription": "C0" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
315 |
}, |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
316 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
317 |
"markers": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
318 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
319 |
"dates": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
320 |
[ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
321 |
*, (glob) |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
322 |
0 |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
323 |
] |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
324 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
325 |
"effects": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
326 |
"description" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
327 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
328 |
"operations": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
329 |
"amend" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
330 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
331 |
"prednodes": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
332 |
"0dec01379d3be6318c470ead31b1fe7ae7cb53d5" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
333 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
334 |
"users": [ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
335 |
"test" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
336 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
337 |
"verb": "reworded" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
338 |
} |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
339 |
], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
340 |
"node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
341 |
"shortdescription": "B1" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
342 |
}, |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
343 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
344 |
"markers": [], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
345 |
"node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
346 |
"shortdescription": "B0" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
347 |
}, |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
348 |
{ |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
349 |
"markers": [], |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
350 |
"node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
351 |
"shortdescription": "A0" |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
352 |
} |
e8660b28bfee
obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents:
5339
diff
changeset
|
353 |
] |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
354 |
$ hg update 471f378eab4c |
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
355 |
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
|
356 |
(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
|
357 |
[255] |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
358 |
$ hg update --hidden 'desc(A0)' |
3747
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
359 |
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
|
360 |
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
|
361 |
(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
|
362 |
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
|
363 |
(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
|
364 |
$ hg update --hidden 0dec01379d3b |
3747
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
365 |
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
|
366 |
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
|
367 |
(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
|
368 |
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
|
369 |
(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
|
370 |
$ 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
|
371 |
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
|
372 |
$ 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
|
373 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |