templatekw: choose {latesttag} by len(changes), not date (
issue5659)
As Augie reported in the bug, the current heuristic of choosing the
best tag of a merge commit by taking the one with newest tag (in terms
of tagging date) currently fails in the Mercurial repo itself. Copying
the example from Yuya:
$ hg glog -T '{node|short} {latesttag}+{latesttagdistance}\n' \
-r '4.2.3: & (merge() + parents(merge()) + tag())'
o
02a745c20121 4.2.3+5
|\
| o
86aca74a063b 4.2.3+4
| |\
| | o
e6d8ee3c9ec3 4.3-rc+109
| | |
| | ~
o |
a3ce07e2dde5 4.3.1+2
: |
o |
3fee7f7d2da0 4.3.1+0
|/
o
98e990bb7330 4.2.3+3
|\
| ~
o
506d7e48fbe6 4.2.3+2
:
o
943c91326b23 4.2.3+0
|
~
It seems to me like the best choice is the tag with the smallest
number of changes since it (across all paths, not the longest single
path). So that's what this patch does, even though it's
costly. Best-of-5 timings for Yuya's command above shows a slowdown
from 1.293s to 1.610s. We can optimize it later.
Differential Revision: https://phab.mercurial-scm.org/D447
$ mkdir folder
$ cd folder
$ hg init
$ mkdir x x/l x/m x/n x/l/u x/l/u/a
$ touch a b x/aa.o x/bb.o
$ hg status
? a
? b
? x/aa.o
? x/bb.o
$ hg status --terse u
? a
? b
? x/
$ hg status --terse maudric
? a
? b
? x/
$ hg status --terse madric
? a
? b
? x/aa.o
? x/bb.o
$ hg status --terse f
abort: 'f' not recognized
[255]
Add a .hgignore so that we can also have ignored files
$ echo ".*\.o" > .hgignore
$ hg status
? .hgignore
? a
? b
$ hg status -i
I x/aa.o
I x/bb.o
Tersing ignored files
$ hg status -t i --ignored
I x/
Adding more files
$ mkdir y
$ touch x/aa x/bb y/l y/m y/l.o y/m.o
$ touch x/l/aa x/m/aa x/n/aa x/l/u/bb x/l/u/a/bb
$ hg status
? .hgignore
? a
? b
? x/aa
? x/bb
? x/l/aa
? x/l/u/a/bb
? x/l/u/bb
? x/m/aa
? x/n/aa
? y/l
? y/m
$ hg status --terse u
? .hgignore
? a
? b
? x/
? y/
$ hg add x/aa x/bb .hgignore
$ hg status --terse au
A .hgignore
A x/aa
A x/bb
? a
? b
? x/l/
? x/m/
? x/n/
? y/
Including ignored files
$ hg status --terse aui
A .hgignore
A x/aa
A x/bb
? a
? b
? x/l/
? x/m/
? x/n/
? y/l
? y/m
$ hg status --terse au -i
I x/aa.o
I x/bb.o
I y/l.o
I y/m.o
Committing some of the files
$ hg commit x/aa x/bb .hgignore -m "First commit"
$ hg status
? a
? b
? x/l/aa
? x/l/u/a/bb
? x/l/u/bb
? x/m/aa
? x/n/aa
? y/l
? y/m
$ hg status --terse mardu
? a
? b
? x/l/
? x/m/
? x/n/
? y/
Modifying already committed files
$ echo "Hello" >> x/aa
$ echo "World" >> x/bb
$ hg status --terse maurdc
M x/aa
M x/bb
? a
? b
? x/l/
? x/m/
? x/n/
? y/
Respecting other flags
$ hg status --terse marduic --all
M x/aa
M x/bb
? a
? b
? x/l/
? x/m/
? x/n/
? y/l
? y/m
I x/aa.o
I x/bb.o
I y/l.o
I y/m.o
C .hgignore
$ hg status --terse marduic -a
$ hg status --terse marduic -c
C .hgignore
$ hg status --terse marduic -m
M x/aa
M x/bb
Passing 'i' in terse value will consider the ignored files while tersing
$ hg status --terse marduic -u
? a
? b
? x/l/
? x/m/
? x/n/
? y/l
? y/m
Omitting 'i' in terse value does not consider ignored files while tersing
$ hg status --terse marduc -u
? a
? b
? x/l/
? x/m/
? x/n/
? y/
Trying with --rev
$ hg status --terse marduic --rev 0 --rev 1
abort: cannot use --terse with --rev
[255]