Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/map @ 990:5007e0bdeed2
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
| author | mpm@selenic.com |
|---|---|
| date | Sun, 21 Aug 2005 21:59:55 -0700 |
| parents | 4f81068ed8cd |
| children | b87aeccf73d9 |
| rev | line source |
|---|---|
|
858
c333dfa8fa1a
[PATCH] Move default page name into map file
Jeff Sipek <jeffpc@optonline.net>
parents:
740
diff
changeset
|
1 default = "changelog" |
| 142 | 2 header = header.tmpl |
| 3 footer = footer.tmpl | |
| 538 | 4 search = search.tmpl |
| 138 | 5 changelog = changelog.tmpl |
|
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
6 naventry = "<a href="?cmd=changelog;rev=#rev#">#label#</a> " |
| 138 | 7 filedifflink = "<a href="?cmd=filediff;node=#node#;file=#file#">#file#</a> " |
| 8 filenodelink = "<a href="?cmd=file;filenode=#filenode#;file=#file#">#file#</a> " | |
| 9 fileellipses = "..." | |
| 10 changelogentry = changelogentry.tmpl | |
|
708
e849b4db6c95
Use changelogentry.tmpl for search results, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
672
diff
changeset
|
11 searchentry = changelogentry.tmpl |
| 138 | 12 changeset = changeset.tmpl |
| 13 manifest = manifest.tmpl | |
| 359 | 14 manifestdirentry = "<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt> <td><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a>" |
| 15 manifestfileentry = "<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt> <td><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a>" | |
| 138 | 16 filerevision = filerevision.tmpl |
| 17 fileannotate = fileannotate.tmpl | |
| 18 filediff = filediff.tmpl | |
| 19 filelog = filelog.tmpl | |
|
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
173
diff
changeset
|
20 fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line|escape#</div>" |
| 138 | 21 filelogentry = filelogentry.tmpl |
|
235
eb341488aa4c
Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
201
diff
changeset
|
22 annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>" |
|
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
23 difflineplus = "<span class="plusline">#line|escape#</span>" |
|
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
24 difflineminus = "<span class="minusline">#line|escape#</span>" |
|
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
25 difflineat = "<span class="atline">#line|escape#</span>" |
|
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
26 diffline = "#line|escape#" |
| 602 | 27 changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>" |
| 28 changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>" | |
| 375 | 29 filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>" |
| 30 fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node|short#</a></td></tr>" | |
| 168 | 31 tags = tags.tmpl |
| 586 | 32 tagentry = "<li class="tagEntry parity#parity#"><span class="node">#node#</span> <a href="?cmd=changeset;node=#node#">#tag#</a></li>" |
|
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
33 diffblock = "<pre class="parity#parity#">#lines#</pre>" |
| 602 | 34 changelogtag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>" |
| 35 changesettag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>" | |
| 36 filediffparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>" | |
|
598
f8d44a2e6928
[PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents:
586
diff
changeset
|
37 filelogparent = "<tr><td align="right">parent #rev#: </td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>" |
| 941 | 38 indexentry = "<tr class="parity#parity#"><td><a href="#url#">#name#</a></td><td>#shortdesc#</td><td>#author# <i>#email|obfuscate#</i></td><td>#lastupdate|age# ago</td></tr>" |
| 39 index = index.tmpl |