This is an archive of the discontinued Mercurial Phabricator instance.

Differential D900

annotate: mark lines affected by skip-annotate with *
ClosedPublic

Authored by sid0 on Oct 2 2017, 5:35 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG884b595f5195: annotate: mark lines affected by skip-annotate with *
Summary

This is to prevent weird surprises from happening with skips being attributed
to the wrong changeset.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

sid0 created this revision.Oct 2 2017, 5:35 AM
indygreg accepted this revision.Oct 2 2017, 6:34 AM
indygreg added a subscriber: indygreg.

This seems reasonable.

Potential follow-ups:

  1. Documentation in help output.
  2. Inline output saying * denotes skip?
  3. Support in templater for indicating skip (maybe test JSON output)?
This revision is now accepted and ready to land.Oct 2 2017, 6:34 AM
sid0 added a comment.Oct 2 2017, 10:51 AM

Yeah, I plan to do all of those before marking the option un-experimental.

sid0 updated this revision to Diff 2330.Oct 2 2017, 11:05 AM
indygreg accepted this revision.Oct 2 2017, 1:15 PM
Closed by commit rHG884b595f5195: annotate: mark lines affected by skip-annotate with * (authored by sid0). · Explain WhyOct 2 2017, 1:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (6 lines)
Mtests/test-annotate.t (38 lines)

Diff 2321

mercurial/commands.py

formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
else: else:
formats.append(['%s' for x in l]) formats.append(['%s' for x in l])
pieces.append(l) pieces.append(l)
for f, p, l in zip(zip(*formats), zip(*pieces), lines): for f, p, l in zip(zip(*formats), zip(*pieces), lines):
fm.startitem() fm.startitem()
fm.write(fields, "".join(f), *p) fm.write(fields, "".join(f), *p)
fm.write('line', ": %s", l[1]) if l[0].skip:
fmt = "* %s"
else:
fmt = ": %s"
fm.write('line', fmt, l[1])
if not lines[-1][1].endswith('\n'): if not lines[-1][1].endswith('\n'):
fm.plain('\n') fm.plain('\n')
fm.end() fm.end()
rootfm.end() rootfm.end()
@command('archive', @command('archive',

tests/test-annotate.t

3 b:5: b5 3 b:5: b5
7 b:7: d 7 b:7: d
--skip a modified line. Note a slight behavior difference in pure - this is --skip a modified line. Note a slight behavior difference in pure - this is
because the pure code comes up with slightly different deltas internally. because the pure code comes up with slightly different deltas internally.
$ hg annotate -nlf b --skip 6 $ hg annotate -nlf b --skip 6
0 a:1: a 0 a:1: a
1 a:2: z (no-pure !)
0 a:1: z (pure !) 0 a:1: z (pure !)
1 a:2* z
1 a:3: a 1 a:3: a
3 b:4: b4 3 b:4: b4
4 b:5: c 4 b:5: c
3 b:5: b5 3 b:5: b5
7 b:7: d 7 b:7: d
--skip added lines (and test multiple skip) --skip added lines (and test multiple skip)
$ hg annotate -nlf b --skip 3 $ hg annotate -nlf b --skip 3
0 a:1: a 0 a:1: a
6 b:2: z 6 b:2: z
1 a:3: a 1 a:3* a
1 a:3: b4 1 a:3* b4
4 b:5: c 4 b:5: c
1 a:3: b5 1 a:3* b5
7 b:7: d 7 b:7: d
$ hg annotate -nlf b --skip 4 $ hg annotate -nlf b --skip 4
0 a:1: a 0 a:1: a
6 b:2: z 6 b:2: z
1 a:3: a 1 a:3* a
3 b:4: b4 3 b:4: b4
1 a:3: c 1 a:3* c
3 b:5: b5 3 b:5: b5
7 b:7: d 7 b:7: d
$ hg annotate -nlf b --skip 3 --skip 4 $ hg annotate -nlf b --skip 3 --skip 4
0 a:1: a 0 a:1: a
6 b:2: z 6 b:2: z
1 a:3: a 1 a:3* a
1 a:3: b4 1 a:3* b4
1 a:3: c 1 a:3* c
1 a:3: b5 1 a:3* b5
7 b:7: d 7 b:7: d
$ hg annotate -nlf b --skip 'merge()' $ hg annotate -nlf b --skip 'merge()'
0 a:1: a 0 a:1: a
6 b:2: z 6 b:2: z
1 a:3: a 1 a:3: a
3 b:4: b4 3 b:4: b4
4 b:5: c 4 b:5: c
3 b:5: b5 3 b:5* b5
3 b:5: d 3 b:5* d
--skip everything -- use the revision the file was introduced in --skip everything -- use the revision the file was introduced in
$ hg annotate -nlf b --skip 'all()' $ hg annotate -nlf b --skip 'all()'
0 a:1: a 0 a:1* a
0 a:1: z 0 a:1* z
0 a:1: a 0 a:1* a
0 a:1: b4 0 a:1* b4
0 a:1: c 0 a:1* c
0 a:1: b5 0 a:1* b5
0 a:1: d 0 a:1* d
Issue2807: alignment of line numbers with -l Issue2807: alignment of line numbers with -l
$ echo more >> b $ echo more >> b
$ hg ci -mmore -d '5 0' $ hg ci -mmore -d '5 0'
$ echo more >> b $ echo more >> b
$ hg ci -mmore -d '6 0' $ hg ci -mmore -d '6 0'
$ echo more >> b $ echo more >> b