author | Anton Shestakov <av6@dwimlabs.net> |
Thu, 19 Dec 2019 18:02:31 +0700 | |
changeset 5044 | b9179a034005 |
parent 4983 | 6d40e0166522 |
child 5123 | 900668a93629 |
child 5251 | 353e546ab324 |
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 |
|
3729
1b1badb3d2fc
obshistory: make obslog work when a commit doesn't have any description
Anton Shestakov <av6@dwimlabs.net>
parents:
3663
diff
changeset
|
9 |
|
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 |
Test output on amended commit |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 |
============================= |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
13 |
Test setup |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
14 |
---------- |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 |
|
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 |
$ hg init $TESTTMP/local-amend |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
17 |
$ hg init $TESTTMP/server |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 |
$ cd $TESTTMP/local-amend |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 |
$ mkcommit ROOT |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
20 |
$ sync |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
21 |
$ mkcommit A0 . |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 |
$ echo 42 >> A0 |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
23 |
$ hg amend -m "A1 |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
24 |
> |
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
25 |
> Better commit message" |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
26 |
$ sync |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 |
$ hg log --hidden -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
28 |
@ changeset: 2:4ae3a4151de9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
| tag: tip |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 |
| parent: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 |
| user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 |
| summary: A1 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
| x changeset: 1:471f378eab4c |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 |
|/ user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 |
| 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
|
38 |
| obsolete: rewritten using amend as 2:4ae3a4151de9 |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 |
| summary: A0 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
| |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 |
o changeset: 0:ea207398892e |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 |
user: test |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 |
date: Thu Jan 01 00:00:00 1970 +0000 |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 |
summary: ROOT |
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
46 |
Check output on the client side |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
47 |
------------------------------- |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
48 |
$ hg obslog --patch 4ae3a4151de9 |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
49 |
@ 4ae3a4151de9 (2) A1 |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
50 |
| |
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
51 |
x 471f378eab4c (1) A0 |
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3432
diff
changeset
|
52 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob) |
3400
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
53 |
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
54 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
55 |
+++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
56 |
@@ -1,1 +1,3 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
57 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
58 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
59 |
+ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
60 |
+Better commit message |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
61 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
62 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
63 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
64 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
65 |
@@ -1,1 +1,2 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
66 |
A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
67 |
+42 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
68 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
69 |
|
3398
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
70 |
$ hg obslog --patch --color debug |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
71 |
@ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1] |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
72 |
| |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
73 |
x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] |
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3432
diff
changeset
|
74 |
[evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(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
|
75 |
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
76 |
[diff.file_a|--- a/changeset-description] |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
77 |
[diff.file_b|+++ b/changeset-description] |
3399
4adf46158b9b
obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3398
diff
changeset
|
78 |
[diff.hunk|@@ -1,1 +1,3 @@] |
4adf46158b9b
obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3398
diff
changeset
|
79 |
[diff.deleted|-A0] |
4adf46158b9b
obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3398
diff
changeset
|
80 |
[diff.inserted|+A1] |
4adf46158b9b
obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3398
diff
changeset
|
81 |
[diff.inserted|+] |
4adf46158b9b
obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3398
diff
changeset
|
82 |
[diff.inserted|+Better commit message] |
3398
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
83 |
|
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
84 |
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0] |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
85 |
[diff.file_a|--- a/A0 Thu Jan 01 00:00:00 1970 +0000] |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
86 |
[diff.file_b|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000] |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
87 |
[diff.hunk|@@ -1,1 +1,2 @@] |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
88 |
A0 |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
89 |
[diff.inserted|+42] |
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
90 |
|
d67e6080e11b
obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3375
diff
changeset
|
91 |
|
2954 | 92 |
|
93 |
$ hg obslog --no-graph --patch 4ae3a4151de9 |
|
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
94 |
4ae3a4151de9 (2) A1 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
95 |
|
2954 | 96 |
471f378eab4c (1) A0 |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
97 |
rewritten(description, content) as 4ae3a4151de9 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
|
98 |
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
99 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
100 |
+++ b/changeset-description |
2954 | 101 |
@@ -1,1 +1,3 @@ |
102 |
-A0 |
|
103 |
+A1 |
|
104 |
+ |
|
105 |
+Better commit message |
|
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
106 |
|
2954 | 107 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
108 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
|
109 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
|
110 |
@@ -1,1 +1,2 @@ |
|
111 |
A0 |
|
112 |
+42 |
|
4952
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
113 |
|
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
114 |
|
2954 | 115 |
|
4944
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
116 |
Test that content diff works with templating |
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
117 |
$ hg obslog --color=debug --patch 4ae3a4151de9 \ |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4964
diff
changeset
|
118 |
> -T '{node|short} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}' |
4944
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
119 |
@ 4ae3a4151de9 A1 |
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
120 |
| |
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
121 |
x 471f378eab4c A0 |
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
122 |
patch: |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
123 |
``` |
4952
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
124 |
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0] |
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
125 |
[diff.file_a|--- a/A0 Thu Jan 01 00:00:00 1970 +0000] |
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
126 |
[diff.file_b|+++ b/A0 Thu Jan 01 00:00:00 1970 +0000] |
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
127 |
[diff.hunk|@@ -1,1 +1,2 @@] |
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
128 |
A0 |
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
129 |
[diff.inserted|+42] |
b135591bec1a
obslog: make {patch} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4951
diff
changeset
|
130 |
``` |
4944
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
131 |
|
4917
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
132 |
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", desc|firstline)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' |
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
133 |
@ A1 |
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
134 |
| |
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
135 |
x A0 at 0 0 by test |
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
136 |
|
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
137 |
|
d1d8e97d32af
obslog: make changeset available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4823
diff
changeset
|
138 |
Check that the same thing works with the old {shortdescription} form |
2957 | 139 |
$ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}' |
140 |
@ A1 |
|
141 |
| |
|
142 |
x A0 at 0 0 by test |
|
143 |
||
2441
80b5fc054219
evolve: adding longer aliases for olog
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
2420
diff
changeset
|
144 |
$ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
145 |
[ |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
146 |
{ |
2957 | 147 |
"markers": [], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4964
diff
changeset
|
148 |
"node": "4ae3a4151de9aa872113f0b196e28323308981e8", |
2957 | 149 |
"shortdescription": "A1" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
150 |
}, |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
151 |
{ |
2957 | 152 |
"markers": [ |
2342
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 |
"date": [ |
155 |
*, (glob) |
|
156 |
0 (glob) |
|
157 |
], |
|
4939
7aba58dc4b73
obslog: use plural name "effects" for list of all effects
Martin von Zweigbergk <martinvonz@google.com>
parents:
4918
diff
changeset
|
158 |
"effects": [ |
2585
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
159 |
"description", |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
160 |
"content" |
b5e3fe610beb
effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents:
2546
diff
changeset
|
161 |
], |
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3432
diff
changeset
|
162 |
"operation": "amend", |
2957 | 163 |
"succnodes": [ |
4951
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4948
diff
changeset
|
164 |
"4ae3a4151de9aa872113f0b196e28323308981e8" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
165 |
], |
2957 | 166 |
"user": "test", |
167 |
"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
|
168 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
169 |
], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4964
diff
changeset
|
170 |
"node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
2957 | 171 |
"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
|
172 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
173 |
] |
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
174 |
$ hg obslog --hidden --patch 471f378eab4c |
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
175 |
x 471f378eab4c (1) A0 |
3559
d166b3dc5e8a
tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents:
3519
diff
changeset
|
176 |
rewritten(description, content) as 4ae3a4151de9 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
|
177 |
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
178 |
--- a/changeset-description |
6d345d7ca682
obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3399
diff
changeset
|
179 |
+++ b/changeset-description |
2639
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
180 |
@@ -1,1 +1,3 @@ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
181 |
-A0 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
182 |
+A1 |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
183 |
+ |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
184 |
+Better commit message |
a5d8062f55ba
obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents:
2637
diff
changeset
|
185 |
|
2637
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
186 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
187 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
188 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
189 |
@@ -1,1 +1,2 @@ |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
190 |
A0 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
191 |
+42 |
49f2741c4dd7
obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents:
2585
diff
changeset
|
192 |
|
2407
783a74c60a5e
obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2404
diff
changeset
|
193 |
|
2477
d7f7e8f3b51c
test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents:
2476
diff
changeset
|
194 |
$ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
195 |
[ |
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 |
"markers": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
198 |
{ |
2957 | 199 |
"date": [ |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
200 |
*, (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
201 |
0 (glob) |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
202 |
], |
4939
7aba58dc4b73
obslog: use plural name "effects" for list of all effects
Martin von Zweigbergk <martinvonz@google.com>
parents:
4918
diff
changeset
|
203 |
"effects": [ |
2957 | 204 |
*, (glob) |
205 |
"content" |
|
206 |
], |
|
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3432
diff
changeset
|
207 |
"operation": "amend", |
2957 | 208 |
"succnodes": [ |
4951
7bfd3fed5d1f
obslog: make {succnodes} be full hex nodes
Martin von Zweigbergk <martinvonz@google.com>
parents:
4948
diff
changeset
|
209 |
"4ae3a4151de9aa872113f0b196e28323308981e8" |
2342
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
210 |
], |
2957 | 211 |
"user": "test", |
212 |
"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
|
213 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
214 |
], |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4964
diff
changeset
|
215 |
"node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
2957 | 216 |
"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
|
217 |
} |
e28026b4d3c1
obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents:
2336
diff
changeset
|
218 |
] |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
219 |
$ hg update 471f378eab4c |
3663
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
220 |
abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! |
54a469cd5b26
test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3567
diff
changeset
|
221 |
(use --hidden to access hidden revisions) |
2290
a36a8c6a09ac
ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents:
2289
diff
changeset
|
222 |
[255] |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
223 |
$ hg update --hidden "desc(A0)" |
3747
1e103c7f7663
test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents:
3730
diff
changeset
|
224 |
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
|
225 |
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
|
226 |
(hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9) |
2289
61d073590fb7
ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
227 |
working directory parent is obsolete! (471f378eab4c) |
2336
93a37e13424f
obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents:
2290
diff
changeset
|
228 |
(use 'hg evolve' to update to its successor: 4ae3a4151de9) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
229 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
230 |
Check output on the server side |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
231 |
------------------------------- |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
232 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
233 |
$ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
234 |
o 4ae3a4151de9 (1) A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
235 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
236 |
x 471f378eab4c |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
237 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
238 |
(No patch available, context is not local) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
239 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
240 |
$ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
241 |
o 4ae3a4151de9 (1) A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
242 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
243 |
$ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
244 |
4ae3a4151de9 (1) A1 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
245 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
246 |
471f378eab4c |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
247 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
248 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
249 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
250 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
251 |
$ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
252 |
4ae3a4151de9 (1) A1 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
253 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
254 |
471f378eab4c |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
255 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
256 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
257 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
258 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
259 |
Amend two more times |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
260 |
==================== |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
261 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
262 |
Amend again |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
263 |
----------- |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
264 |
$ hg log --hidden -G |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
265 |
o changeset: 2:4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
266 |
| tag: tip |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
267 |
| parent: 0:ea207398892e |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
268 |
| user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
269 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
270 |
| summary: A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
271 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
272 |
| @ changeset: 1:471f378eab4c |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
273 |
|/ user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
274 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
275 |
| obsolete: rewritten using amend as 2:4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
276 |
| summary: A0 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
277 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
278 |
o changeset: 0:ea207398892e |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
279 |
user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
280 |
date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
281 |
summary: ROOT |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
282 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
283 |
$ hg up tip |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
284 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
285 |
$ hg amend -m "A2 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
286 |
> |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
287 |
> Better better commit message" |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
288 |
$ hg amend -m "A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
289 |
> |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
290 |
> Better better better commit message" |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
291 |
$ sync |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
292 |
$ hg log --hidden -G |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
293 |
@ changeset: 4:92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
294 |
| tag: tip |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
295 |
| parent: 0:ea207398892e |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
296 |
| user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
297 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
298 |
| summary: A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
299 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
300 |
| x changeset: 3:4f1685185907 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
301 |
|/ parent: 0:ea207398892e |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
302 |
| user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
303 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
304 |
| obsolete: reworded using amend as 4:92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
305 |
| summary: A2 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
306 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
307 |
| x changeset: 2:4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
308 |
|/ parent: 0:ea207398892e |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
309 |
| user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
310 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
311 |
| obsolete: reworded using amend as 3:4f1685185907 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
312 |
| summary: A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
313 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
314 |
| x changeset: 1:471f378eab4c |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
315 |
|/ user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
316 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
317 |
| obsolete: rewritten using amend as 2:4ae3a4151de9 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
318 |
| summary: A0 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
319 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
320 |
o changeset: 0:ea207398892e |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
321 |
user: test |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
322 |
date: Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
323 |
summary: ROOT |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
324 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
325 |
Check the output on the client |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
326 |
------------------------------ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
327 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
328 |
$ hg obslog --patch 92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
329 |
@ 92210308515b (4) A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
330 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
331 |
x 4f1685185907 (3) A2 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
332 |
| rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
333 |
| diff -r 4f1685185907 -r 92210308515b changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
334 |
| --- a/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
335 |
| +++ b/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
336 |
| @@ -1,3 +1,3 @@ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
337 |
| -A2 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
338 |
| +A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
339 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
340 |
| -Better better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
341 |
| +Better better better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
342 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
343 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
344 |
x 4ae3a4151de9 (2) A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
345 |
| rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
346 |
| diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
347 |
| --- a/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
348 |
| +++ b/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
349 |
| @@ -1,3 +1,3 @@ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
350 |
| -A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
351 |
| +A2 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
352 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
353 |
| -Better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
354 |
| +Better better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
355 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
356 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
357 |
x 471f378eab4c (1) A0 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
358 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
359 |
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
360 |
--- a/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
361 |
+++ b/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
362 |
@@ -1,1 +1,3 @@ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
363 |
-A0 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
364 |
+A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
365 |
+ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
366 |
+Better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
367 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
368 |
diff -r 471f378eab4c -r 4ae3a4151de9 A0 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
369 |
--- a/A0 Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
370 |
+++ b/A0 Thu Jan 01 00:00:00 1970 +0000 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
371 |
@@ -1,1 +1,2 @@ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
372 |
A0 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
373 |
+42 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
374 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
375 |
|
4944
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
376 |
Test that description diff works with templating |
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
377 |
$ hg obslog --color=debug --patch 92210308515b \ |
4983
6d40e0166522
obslog: make {node} the full node and leave shortening to template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4964
diff
changeset
|
378 |
> -T '{node|short} {desc|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}' |
4944
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
379 |
@ 92210308515b A3 |
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
380 |
| |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
381 |
x 4f1685185907 A2 |
4945
bd50608f54d8
obslog: rename {desc-diff} to {descdiff} since the former is invalid
Martin von Zweigbergk <martinvonz@google.com>
parents:
4944
diff
changeset
|
382 |
| description diff: |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
383 |
| ``` |
4953
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
384 |
| [diff.diffline|diff -r 4f1685185907 -r 92210308515b changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
385 |
| [diff.file_a|--- a/changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
386 |
| [diff.file_b|+++ b/changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
387 |
| [diff.hunk|@@ -1,3 +1,3 @@] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
388 |
| [diff.deleted|-A2] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
389 |
| [diff.inserted|+A3] |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
390 |
| |
4953
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
391 |
| [diff.deleted|-Better better commit message] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
392 |
| [diff.inserted|+Better better better commit message] |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
393 |
| ``` |
4945
bd50608f54d8
obslog: rename {desc-diff} to {descdiff} since the former is invalid
Martin von Zweigbergk <martinvonz@google.com>
parents:
4944
diff
changeset
|
394 |
x 4ae3a4151de9 A1 |
bd50608f54d8
obslog: rename {desc-diff} to {descdiff} since the former is invalid
Martin von Zweigbergk <martinvonz@google.com>
parents:
4944
diff
changeset
|
395 |
| description diff: |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
396 |
| ``` |
4953
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
397 |
| [diff.diffline|diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
398 |
| [diff.file_a|--- a/changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
399 |
| [diff.file_b|+++ b/changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
400 |
| [diff.hunk|@@ -1,3 +1,3 @@] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
401 |
| [diff.deleted|-A1] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
402 |
| [diff.inserted|+A2] |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
403 |
| |
4953
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
404 |
| [diff.deleted|-Better commit message] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
405 |
| [diff.inserted|+Better better commit message] |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
406 |
| ``` |
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
407 |
x 471f378eab4c A0 |
4945
bd50608f54d8
obslog: rename {desc-diff} to {descdiff} since the former is invalid
Martin von Zweigbergk <martinvonz@google.com>
parents:
4944
diff
changeset
|
408 |
description diff: |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
409 |
``` |
4953
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
410 |
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
411 |
[diff.file_a|--- a/changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
412 |
[diff.file_b|+++ b/changeset-description] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
413 |
[diff.hunk|@@ -1,1 +1,3 @@] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
414 |
[diff.deleted|-A0] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
415 |
[diff.inserted|+A1] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
416 |
[diff.inserted|+] |
5c41bb482867
obslog: make {descdiff} not be indented and leave that to the template
Martin von Zweigbergk <martinvonz@google.com>
parents:
4952
diff
changeset
|
417 |
[diff.inserted|+Better commit message] |
4946
bd992b1d4426
obslog: make content and description patches available to templater
Martin von Zweigbergk <martinvonz@google.com>
parents:
4945
diff
changeset
|
418 |
``` |
4944
f84a6ddb7f37
tests: demonstrate broken {patch} and {desc-diff} template keywords
Martin von Zweigbergk <martinvonz@google.com>
parents:
4939
diff
changeset
|
419 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
420 |
Check the output on the server |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
421 |
------------------------------ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
422 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
423 |
$ hg obslog -R $TESTTMP/server --patch 92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
424 |
o 92210308515b (2) A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
425 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
426 |
x 4f1685185907 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
427 |
| rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
428 |
| (No patch available, context is not local) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
429 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
430 |
x 4ae3a4151de9 (1) A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
431 |
| rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
432 |
| (No patch available, successor is unknown locally) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
433 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
434 |
x 471f378eab4c |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
435 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
436 |
(No patch available, context is not local) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
437 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
438 |
$ hg obslog -R $TESTTMP/server -f --patch 92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
439 |
o 92210308515b (2) A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
440 |
| |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
441 |
x 4ae3a4151de9 (1) A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
442 |
reworded(description) as 92210308515b using amend by test (at Thu Jan 01 00:00:00 1970 +0000) |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
443 |
diff -r 4ae3a4151de9 -r 92210308515b changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
444 |
--- a/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
445 |
+++ b/changeset-description |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
446 |
@@ -1,3 +1,3 @@ |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
447 |
-A1 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
448 |
+A3 |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
449 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
450 |
-Better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
451 |
+Better better better commit message |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
452 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
453 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
454 |
$ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
455 |
92210308515b (2) A3 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
456 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
457 |
4f1685185907 |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
458 |
rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
459 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
460 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
461 |
4ae3a4151de9 (1) A1 |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
462 |
rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
463 |
(No patch available, successor is unknown locally) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
464 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
465 |
471f378eab4c |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
466 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
467 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
468 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
469 |
|
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
470 |
$ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b |
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
471 |
92210308515b (2) A3 |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
472 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
473 |
4f1685185907 |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
474 |
rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
475 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
476 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
477 |
4ae3a4151de9 (1) A1 |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
478 |
rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
479 |
(No patch available, successor is unknown locally) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
480 |
|
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
481 |
471f378eab4c |
4964
bb2042ff6444
tests: remove extra whitespace before patch in obslog output
Martin von Zweigbergk <martinvonz@google.com>
parents:
4955
diff
changeset
|
482 |
rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3894
7c624b45fe60
obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents:
3886
diff
changeset
|
483 |
(No patch available, context is not local) |
4948
069cfc5301fb
obslog: add newline after all markers in non-graphlog to match graphlog
Martin von Zweigbergk <martinvonz@google.com>
parents:
4946
diff
changeset
|
484 |