Mercurial > hg
annotate mercurial/templates/paper/shortlogentry.tmpl @ 49010:681b25ea579e
contrib: add a partial-merge tool for sorted lists (such as Python imports)
This is a pretty naive tool that uses a regular expression for
matching lines. It is based on a Google-internal tool that worked in a
similar way.
For now, the regular expression is hard-coded to attempt to match
single-line Python imports. The only commit I've found in the hg core
repo where the tool helped was commit 9cd6292abfdf. I think that's
because we often use multiple imports per import statement. I think
this tool is still a decent first step (especially once the regex is
made configurable in the next patch). The merging should ideally use a
proper Python parser and do the merge at the AST (or CST?) level, but
that's significantly harder, especially if you want to preserve
comments and whitespace. It's also less generic.
Differential Revision: https://phab.mercurial-scm.org/D12380
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 04 Mar 2022 16:12:56 -0800 |
parents | 9acc0360ff67 |
children |
rev | line source |
---|---|
19452
6f5556454edd
hgweb: make stripes in log and search with CSS
Alexander Plavin <me@aplavin.ru>
parents:
18526
diff
changeset
|
1 <tr> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14046
diff
changeset
|
2 <td class="age">{date|rfc822date}</td> |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
3 <td class="author">{author|person}</td> |
25108
09ec4220a839
hgweb: split some long lines in paper, gitweb and monoblue styles
Anton Shestakov <engored@ya.ru>
parents:
19529
diff
changeset
|
4 <td class="description"> |
09ec4220a839
hgweb: split some long lines in paper, gitweb and monoblue styles
Anton Shestakov <engored@ya.ru>
parents:
19529
diff
changeset
|
5 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a> |
35064
9acc0360ff67
hgweb: move changeset "tags" to a template in map file (paper and coal)
Anton Shestakov <av6@dwimlabs.net>
parents:
25108
diff
changeset
|
6 {alltags} |
25108
09ec4220a839
hgweb: split some long lines in paper, gitweb and monoblue styles
Anton Shestakov <engored@ya.ru>
parents:
19529
diff
changeset
|
7 </td> |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
diff
changeset
|
8 </tr> |