Show More
@@ -400,7 +400,11 b' def annotate(ui, repo, *pats, **opts):' | |||||
400 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): |
|
400 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): | |
401 | fm.startitem() |
|
401 | fm.startitem() | |
402 | fm.write(fields, "".join(f), *p) |
|
402 | fm.write(fields, "".join(f), *p) | |
403 | fm.write('line', ": %s", l[1]) |
|
403 | if l[0].skip: | |
|
404 | fmt = "* %s" | |||
|
405 | else: | |||
|
406 | fmt = ": %s" | |||
|
407 | fm.write('line', fmt, l[1]) | |||
404 |
|
408 | |||
405 | if not lines[-1][1].endswith('\n'): |
|
409 | if not lines[-1][1].endswith('\n'): | |
406 | fm.plain('\n') |
|
410 | fm.plain('\n') |
@@ -261,8 +261,8 b' because the pure code comes up with slig' | |||||
261 |
|
261 | |||
262 | $ hg annotate -nlf b --skip 6 |
|
262 | $ hg annotate -nlf b --skip 6 | |
263 | 0 a:1: a |
|
263 | 0 a:1: a | |
264 | 1 a:2: z (no-pure !) |
|
|||
265 | 0 a:1: z (pure !) |
|
264 | 0 a:1: z (pure !) | |
|
265 | 1 a:2* z | |||
266 | 1 a:3: a |
|
266 | 1 a:3: a | |
267 | 3 b:4: b4 |
|
267 | 3 b:4: b4 | |
268 | 4 b:5: c |
|
268 | 4 b:5: c | |
@@ -275,9 +275,9 b' because the pure code comes up with slig' | |||||
275 | 0 a:1: a |
|
275 | 0 a:1: a | |
276 | 6 b:2: z |
|
276 | 6 b:2: z | |
277 | 1 a:3: a |
|
277 | 1 a:3: a | |
278 |
1 a:3 |
|
278 | 1 a:3* b4 | |
279 | 4 b:5: c |
|
279 | 4 b:5: c | |
280 |
1 a:3 |
|
280 | 1 a:3* b5 | |
281 | 7 b:7: d |
|
281 | 7 b:7: d | |
282 |
|
282 | |||
283 | $ hg annotate -nlf b --skip 4 |
|
283 | $ hg annotate -nlf b --skip 4 | |
@@ -285,7 +285,7 b' because the pure code comes up with slig' | |||||
285 | 6 b:2: z |
|
285 | 6 b:2: z | |
286 | 1 a:3: a |
|
286 | 1 a:3: a | |
287 | 3 b:4: b4 |
|
287 | 3 b:4: b4 | |
288 |
1 a:3 |
|
288 | 1 a:3* c | |
289 | 3 b:5: b5 |
|
289 | 3 b:5: b5 | |
290 | 7 b:7: d |
|
290 | 7 b:7: d | |
291 |
|
291 | |||
@@ -293,9 +293,9 b' because the pure code comes up with slig' | |||||
293 | 0 a:1: a |
|
293 | 0 a:1: a | |
294 | 6 b:2: z |
|
294 | 6 b:2: z | |
295 | 1 a:3: a |
|
295 | 1 a:3: a | |
296 |
1 a:3 |
|
296 | 1 a:3* b4 | |
297 |
1 a:3 |
|
297 | 1 a:3* c | |
298 |
1 a:3 |
|
298 | 1 a:3* b5 | |
299 | 7 b:7: d |
|
299 | 7 b:7: d | |
300 |
|
300 | |||
301 | $ hg annotate -nlf b --skip 'merge()' |
|
301 | $ hg annotate -nlf b --skip 'merge()' | |
@@ -305,18 +305,18 b' because the pure code comes up with slig' | |||||
305 | 3 b:4: b4 |
|
305 | 3 b:4: b4 | |
306 | 4 b:5: c |
|
306 | 4 b:5: c | |
307 | 3 b:5: b5 |
|
307 | 3 b:5: b5 | |
308 |
3 b:5 |
|
308 | 3 b:5* d | |
309 |
|
309 | |||
310 | --skip everything -- use the revision the file was introduced in |
|
310 | --skip everything -- use the revision the file was introduced in | |
311 |
|
311 | |||
312 | $ hg annotate -nlf b --skip 'all()' |
|
312 | $ hg annotate -nlf b --skip 'all()' | |
313 | 0 a:1: a |
|
313 | 0 a:1: a | |
314 |
0 a:1 |
|
314 | 0 a:1* z | |
315 |
0 a:1 |
|
315 | 0 a:1* a | |
316 |
0 a:1 |
|
316 | 0 a:1* b4 | |
317 |
0 a:1 |
|
317 | 0 a:1* c | |
318 |
0 a:1 |
|
318 | 0 a:1* b5 | |
319 |
0 a:1 |
|
319 | 0 a:1* d | |
320 |
|
320 | |||
321 | Issue2807: alignment of line numbers with -l |
|
321 | Issue2807: alignment of line numbers with -l | |
322 |
|
322 |
General Comments 0
You need to be logged in to leave comments.
Login now