Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/fileannotate.tmpl @ 1564:34579a67fa71
Re: [PATCH 2 of 3] remove walk warning about nonexistent files
On 11/15/05, Robin Farine <robin.farine@terminus.org> wrote:
> # HG changeset patch
> # User Robin Farine <robin.farine@terminus.org>
> # Node ID ce0a3cc309a8d1e81278ec01a3c61fbb99c691f4
> # Parent feb77e0951e74d75c213e8471f107fdcc124c876
> remove walk warning about nonexistent files
>
> diff -r feb77e0951e7 -r ce0a3cc309a8 mercurial/dirstate.py
> --- a/mercurial/dirstate.py Tue Nov 15 08:42:45 2005 +0100
> +++ b/mercurial/dirstate.py Tue Nov 15 08:59:50 2005 +0100
> @@ -336,9 +336,6 @@
> try:
> st = os.lstat(f)
> except OSError, inst:
> - if ff not in dc: self.ui.warn('%s: %s\n' % (
> - util.pathto(self.getcwd(), ff),
> - inst.strerror))
> continue
> if stat.S_ISDIR(st.st_mode):
> cmp1 = (lambda x, y: cmp(x[1], y[1]))
this break some tests,
a better fix would be to check if ff can be a directory prefix from files in dc
you can try the attached patch.
Benoit
author | Benoit Boissinot <bboissin@gmail.com> |
---|---|
date | Thu, 01 Dec 2005 10:48:29 -0600 |
parents | 19d2776f1725 |
children | ba625c8083d8 |
rev | line source |
---|---|
142 | 1 #header# |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
168
diff
changeset
|
2 <title>#repo|escape#: #file# annotate</title> |
142 | 3 </head> |
138 | 4 <body> |
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:
1370
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:
1370
diff
changeset
|
8 <a href="?tags=">tags</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
9 <a href="?cs=#node|short#">changeset</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
10 <a href="?mf=#manifest|short#;path=#path#">manifest</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
11 <a href="?f=#filenode|short#;file=#file#">file</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
12 <a href="?fl=#filenode|short#;file=#file#">revisions</a> |
142 | 13 </div> |
138 | 14 |
1370
710079d2a821
hgweb: remove various manifest and file hashes from display
Matt Mackall <mpm@selenic.com>
parents:
981
diff
changeset
|
15 <h2>Annotate #file#</h2> |
138 | 16 |
17 <table> | |
18 <tr> | |
167 | 19 <td class="metatag">changeset #rev#:</td> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
1370
diff
changeset
|
20 <td><a href="?cs=#node|short#">#node|short#</a></td></tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1410
diff
changeset
|
21 #parent%fileannotateparent# |
138 | 22 <tr> |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
23 <td class="metatag">author:</td> |
201
f918a6fa2572
hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents:
168
diff
changeset
|
24 <td>#author|obfuscate#</td></tr> |
138 | 25 <tr> |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
26 <td class="metatag">date:</td> |
236
85f0420fd848
Removed extra closing brace from date string.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
201
diff
changeset
|
27 <td>#date|date# (#date|age# ago)</td></tr> |
359 | 28 <tr> |
29 <td class="metatag">permissions:</td> | |
30 <td>#permissions|permissions#</td></tr> | |
138 | 31 </table> |
32 | |
142 | 33 <br/> |
138 | 34 |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
35 <table cellspacing="0" cellpadding="0"> |
977
289975641886
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
570
diff
changeset
|
36 #annotate%annotateline# |
138 | 37 </table> |
38 | |
142 | 39 #footer# |