175 | |
175 | |
176 x fdf9bde5129a |
176 x fdf9bde5129a |
177 | rewritten using amend |
177 | rewritten using amend |
178 @ 471f378eab4c 1 A0 |
178 @ 471f378eab4c 1 A0 |
179 rewritten using amend |
179 rewritten using amend |
|
180 |
|
181 Test output with non-local changesets and various templates |
|
182 =========================================================== |
|
183 |
|
184 $ hg init $TESTTMP/obslog-non-local-templates |
|
185 $ cd $TESTTMP/obslog-non-local-templates |
|
186 $ cat << EOF >> .hg/hgrc |
|
187 > [templates] |
|
188 > fancy = '{desc|firstline}\n{markers % "{verb} using {operations} by {users} ({join(notes, "; ")})"}' |
|
189 > fancier = '{desc|firstline}\n{markers % "{join(users, ", ")} had {verb} this commit using {join(operations, "/")} and said: {join(notes % "\"{note}\"", ", ")})"}' |
|
190 > EOF |
|
191 |
|
192 $ mkcommit A0 |
|
193 $ hg metaedit -m 'A1' -n 'note1' -d '42 0' --config devel.default-date='1 0' -q |
|
194 $ HGUSER=alice hg amend -m 'A2' -n 'note2' |
|
195 $ HGUSER=bob hg amend -m 'A3' -n 'note3' |
|
196 |
|
197 $ hg debugobsolete |
|
198 6ffd04c870fe2b73e7c885e508c4f1213a75c4d4 e481355d236800802337be3e637bd820870b04d2 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '33', 'note': 'note1', 'operation': 'metaedit', 'user': 'test'} |
|
199 e481355d236800802337be3e637bd820870b04d2 65835bf83412a950e6a47f023690d5e6ae09718d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'note': 'note2', 'operation': 'amend', 'user': 'alice'} |
|
200 65835bf83412a950e6a47f023690d5e6ae09718d 41985e02b792daac8907f6b30b513bbf6e8e034d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'note': 'note3', 'operation': 'amend', 'user': 'bob'} |
|
201 |
|
202 $ hg strip 'desc(A1) + desc(A2)' --hidden --quiet --config extensions.strip= |
|
203 |
|
204 $ hg obslog -f |
|
205 @ 41985e02b792 (1) A3 |
|
206 | |
|
207 x 6ffd04c870fe (0) A0 |
|
208 rewritten(description, date) as 41985e02b792 using amend, metaedit by alice, bob, test (between Thu Jan 01 00:00:00 1970 +0000 and Thu Jan 01 00:00:01 1970 +0000) |
|
209 note: note1 |
|
210 note: note2 |
|
211 note: note3 |
|
212 |
|
213 $ hg obslog -f -T fancy |
|
214 @ A3 |
|
215 | |
|
216 x A0 |
|
217 rewritten using amend, metaedit by alice, bob, test (note1; note2; note3) |
|
218 |
|
219 $ hg obslog -f -T fancier |
|
220 @ A3 |
|
221 | |
|
222 x A0 |
|
223 alice, bob, test had rewritten this commit using amend/metaedit and said: "note1", "note2", "note3") |