Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filediff.tmpl @ 1998:65cc17ae9649
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 24 Mar 2006 09:08:12 -0800 |
parents | f2ebd5251e88 |
children | 46b19175fec6 |
rev | line source |
---|---|
142 | 1 #header# |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
2 <title>#repo|escape#: #file|escape# diff</title> |
142 | 3 </head> |
4 <body> | |
138 | 5 |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
6 <div class="buttons"> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
7 <a href="?cl=#rev#">changelog</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
8 <a href="?tags=">tags</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
9 <a href="?cs=#node|short#">changeset</a> |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
10 <a href="?f=#filenode|short#;file=#file|urlescape#">file</a> |
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
11 <a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a> |
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
12 <a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a> |
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
13 <a href="?fd=#node|short#;file=#file|urlescape#;style=raw">raw</a> |
142 | 14 </div> |
138 | 15 |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
16 <h2>#file|escape#</h2> |
138 | 17 |
602 | 18 <table id="filediffEntry"> |
138 | 19 <tr> |
602 | 20 <th class="revision">revision #rev#:</th> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
21 <td class="revision"><a href="?cs=#node|short#">#node|short#</a></td> |
602 | 22 </tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1410
diff
changeset
|
23 #parent%filediffparent# |
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1416
diff
changeset
|
24 #child%filediffchild# |
138 | 25 </table> |
26 | |
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
27 <div id="fileDiff"> |
138 | 28 #diff# |
602 | 29 </div> |
138 | 30 |
142 | 31 #footer# |
138 | 32 |
33 |