--- a/hgext/patchbomb.py Mon May 18 17:36:24 2009 -0500
+++ b/hgext/patchbomb.py Tue May 19 01:17:54 2009 +0200
@@ -20,13 +20,13 @@
The patch itself, as generated by "hg export".
-Each message refers to all of its predecessors using the In-Reply-To
+Each message refers to the first in the series using the In-Reply-To
and References headers, so they will show up as a sequence in threaded
mail and news readers, and in mail archives.
-For each changeset, you will be prompted with a diffstat summary and
-the changeset summary, so you can be sure you are sending the right
-changes.
+With the -d/--diffstat option, you will be prompted for each changeset
+with a diffstat summary and the changeset summary, so you can be sure
+you are sending the right changes.
To enable this extension:
@@ -47,11 +47,11 @@
To avoid sending patches prematurely, it is a good idea to first run
the "email" command with the "-n" option (test only). You will be
-prompted for an email recipient address, a subject an an introductory
+prompted for an email recipient address, a subject and an introductory
message describing the patches of your patchbomb. Then when all is
-done, patchbomb messages are displayed. If PAGER environment variable
-is set, your pager will be fired up once for each patchbomb message,
-so you can verify everything is alright.
+done, patchbomb messages are displayed. If the PAGER environment
+variable is set, your pager will be fired up once for each patchbomb
+message, so you can verify everything is alright.
The -m/--mbox option is also very useful. Instead of previewing each
patchbomb message in a pager or sending the messages directly, it will
@@ -70,7 +70,7 @@
That should be all. Now your patchbomb is on its way out.
You can also either configure the method option in the email section
-to be a sendmail compatable mailer or fill out the [smtp] section so
+to be a sendmail compatible mailer or fill out the [smtp] section so
that the patchbomb extension can automatically send patchbombs
directly from the commandline. See the [email] and [smtp] sections in
hgrc(5) for details.'''
--- a/templates/paper/fileannotate.tmpl Mon May 18 17:36:24 2009 -0500
+++ b/templates/paper/fileannotate.tmpl Tue May 19 01:17:54 2009 +0200
@@ -62,8 +62,6 @@
{changesettag}
</table>
-<br/>
-
<div class="overflow">
<table class="bigtable">
<tr>
--- a/templates/spartan/fileannotate.tmpl Mon May 18 17:36:24 2009 -0500
+++ b/templates/spartan/fileannotate.tmpl Tue May 19 01:17:54 2009 +0200
@@ -41,8 +41,6 @@
</tr>
</table>
-<br/>
-
<table cellspacing="0" cellpadding="0">
{annotate%annotateline}
</table>
--- a/templates/spartan/map Mon May 18 17:36:24 2009 -0500
+++ b/templates/spartan/map Tue May 19 01:17:54 2009 +0200
@@ -42,8 +42,12 @@
fileannotate = fileannotate.tmpl
filediff = filediff.tmpl
filelog = filelog.tmpl
-fileline = '<div class="parity{parity}"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</div>'
+fileline = '<div class="parity{parity}"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
filelogentry = filelogentry.tmpl
+
+# The ensures that all table cells have content (even if there
+# is an empty line in the annotated file), which in turn ensures that
+# all table rows have equal height.
annotateline = '
<tr class="parity{parity}">
<td class="annotate">
@@ -53,7 +57,7 @@
<td>
<a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>
</td>
- <td><pre>{line|escape}</pre></td>
+ <td><pre> {line|escape}</pre></td>
</tr>'
difflineplus = '<span class="plusline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>'
difflineminus = '<span class="minusline"><a class="lineno" href="#{lineid}" id="{lineid}">{linenumber}</a>{line|escape}</span>'
--- a/templates/static/style-coal.css Mon May 18 17:36:24 2009 -0500
+++ b/templates/static/style-coal.css Tue May 19 01:17:54 2009 +0200
@@ -18,7 +18,7 @@
}
#.main {
- width:98%;
+ width: 98%;
}
.overflow {
@@ -106,7 +106,7 @@
.navigate {
text-align: right;
font-size: 60%;
- margin: 1em 0 1em 0;
+ margin: 1em 0;
}
.tag {
@@ -162,14 +162,12 @@
}
.bigtable td {
- padding: 1px 4px 1px 4px;
vertical-align: top;
}
.bigtable th {
- padding: 1px 4px 1px 4px;
+ padding: 1px 4px;
border-bottom: 1px solid #999;
- font-size: smaller;
}
.bigtable tr { border: none; }
.bigtable .age { width: 6em; }
@@ -187,9 +185,10 @@
.source, .sourcefirst, .sourcelast {
font-family: monospace;
white-space: pre;
+ padding: 1px 4px;
font-size: 90%;
}
-.sourcefirst { border-bottom: 1px solid #999; font-weight: bold; font-size: smaller; }
+.sourcefirst { border-bottom: 1px solid #999; font-weight: bold; }
.sourcelast { border-top: 1px solid #999; }
.source a { color: #999; font-size: smaller; font-family: monospace;}
.bottomline { border-bottom: 1px solid #999; }
@@ -206,7 +205,7 @@
}
#changesetEntry th {
- padding: 1px 4px 1px 4px;
+ padding: 1px 4px;
width: 4em;
text-align: right;
font-weight: normal;
@@ -221,6 +220,7 @@
padding: .3em;
}
+/* Graph */
div#wrapper {
position: relative;
border-top: 1px solid black;
--- a/templates/static/style-paper.css Mon May 18 17:36:24 2009 -0500
+++ b/templates/static/style-paper.css Tue May 19 01:17:54 2009 +0200
@@ -54,7 +54,7 @@
font-weight: bold;
}
-.menu img {
+.menu img {
width: 75px;
height: 90px;
border: 0;
@@ -97,7 +97,7 @@
.navigate {
text-align: right;
font-size: 60%;
- margin: 1em 0 1em 0;
+ margin: 1em 0;
}
.tag {
@@ -153,14 +153,12 @@
}
.bigtable td {
- padding: 1px 4px 1px 4px;
vertical-align: top;
}
.bigtable th {
- padding: 1px 4px 1px 4px;
+ padding: 1px 4px;
border-bottom: 1px solid #999;
- font-size: smaller;
}
.bigtable tr { border: none; }
.bigtable .age { width: 6em; }
@@ -176,9 +174,10 @@
.source, .sourcefirst, .sourcelast {
font-family: monospace;
white-space: pre;
+ padding: 1px 4px;
font-size: 90%;
}
-.sourcefirst { border-bottom: 1px solid #999; font-weight: bold; font-size: smaller; }
+.sourcefirst { border-bottom: 1px solid #999; font-weight: bold; }
.sourcelast { border-top: 1px solid #999; }
.source a { color: #999; font-size: smaller; font-family: monospace;}
.bottomline { border-bottom: 1px solid #999; }
@@ -195,7 +194,7 @@
}
#changesetEntry th {
- padding: 1px 4px 1px 4px;
+ padding: 1px 4px;
width: 4em;
text-align: right;
font-weight: normal;
@@ -226,6 +225,14 @@
margin: 0;
}
+ul#graphnodes {
+ position: absolute;
+ z-index: 10;
+ top: -1.0em;
+ list-style: none inside none;
+ padding: 0;
+}
+
ul#nodebgs {
list-style: none inside none;
padding: 0;
@@ -237,14 +244,6 @@
height: 39px;
}
-ul#graphnodes {
- position: absolute;
- z-index: 10;
- top: -1.0em;
- list-style: none inside none;
- padding: 0;
-}
-
ul#graphnodes li .info {
display: block;
font-size: 70%;
--- a/templates/static/style.css Mon May 18 17:36:24 2009 -0500
+++ b/templates/static/style.css Tue May 19 01:17:54 2009 +0200
@@ -2,16 +2,16 @@
.age { white-space:nowrap; }
.date { white-space:nowrap; }
.indexlinks { white-space:nowrap; }
-.parity0 { background-color: #dddddd; }
-.parity1 { background-color: #eeeeee; }
-.lineno { width: 60px; color: #aaaaaa; font-size: smaller;
- text-align: right; padding-right:1em; }
+.parity0 { background-color: #ddd; }
+.parity1 { background-color: #eee; }
+.lineno { width: 60px; color: #aaa; font-size: smaller;
+ text-align: right; }
.plusline { color: green; }
.minusline { color: red; }
.atline { color: purple; }
.annotate { font-size: smaller; text-align: right; padding-right: 1em; }
.buttons a {
- background-color: #666666;
+ background-color: #666;
padding: 2pt;
color: white;
font-family: sans;
@@ -25,7 +25,7 @@
}
.metatag {
- background-color: #888888;
+ background-color: #888;
color: white;
text-align: right;
}
--- a/tests/test-hgweb-commands.out Mon May 18 17:36:24 2009 -0500
+++ b/tests/test-hgweb-commands.out Tue May 19 01:17:54 2009 +0200
@@ -884,16 +884,16 @@
.age { white-space:nowrap; }
.date { white-space:nowrap; }
.indexlinks { white-space:nowrap; }
-.parity0 { background-color: #dddddd; }
-.parity1 { background-color: #eeeeee; }
-.lineno { width: 60px; color: #aaaaaa; font-size: smaller;
- text-align: right; padding-right:1em; }
+.parity0 { background-color: #ddd; }
+.parity1 { background-color: #eee; }
+.lineno { width: 60px; color: #aaa; font-size: smaller;
+ text-align: right; }
.plusline { color: green; }
.minusline { color: red; }
.atline { color: purple; }
.annotate { font-size: smaller; text-align: right; padding-right: 1em; }
.buttons a {
- background-color: #666666;
+ background-color: #666;
padding: 2pt;
color: white;
font-family: sans;
@@ -907,7 +907,7 @@
}
.metatag {
- background-color: #888888;
+ background-color: #888;
color: white;
text-align: right;
}
--- a/tests/test-highlight.out Mon May 18 17:36:24 2009 -0500
+++ b/tests/test-highlight.out Tue May 19 01:17:54 2009 +0200
@@ -280,8 +280,6 @@
</table>
-<br/>
-
<div class="overflow">
<table class="bigtable">
<tr>