--- a/mercurial/commands.py Sun Mar 13 08:50:06 2011 -0500
+++ b/mercurial/commands.py Sun Mar 13 15:59:50 2011 +0100
@@ -509,9 +509,9 @@
if mark is None:
raise util.Abort(_("new bookmark name required"))
marks[mark] = marks[rename]
- del marks[rename]
if repo._bookmarkcurrent == rename:
bookmarks.setcurrent(repo, mark)
+ del marks[rename]
bookmarks.write(repo)
return
--- a/mercurial/templates/gitweb/graph.tmpl Sun Mar 13 08:50:06 2011 -0500
+++ b/mercurial/templates/gitweb/graph.tmpl Sun Mar 13 15:59:50 2011 +0100
@@ -39,7 +39,7 @@
<div id="wrapper">
<ul id="nodebgs"></ul>
-<canvas id="graph" width="224" height="{canvasheight}"></canvas>
+<canvas id="graph" width="480" height="{canvasheight}"></canvas>
<ul id="graphnodes"></ul>
</div>
--- a/mercurial/templates/monoblue/graph.tmpl Sun Mar 13 08:50:06 2011 -0500
+++ b/mercurial/templates/monoblue/graph.tmpl Sun Mar 13 15:59:50 2011 +0100
@@ -35,7 +35,7 @@
<div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
<div id="wrapper">
<ul id="nodebgs"></ul>
- <canvas id="graph" width="224" height="{canvasheight}"></canvas>
+ <canvas id="graph" width="480" height="{canvasheight}"></canvas>
<ul id="graphnodes"></ul>
</div>
--- a/mercurial/templates/paper/graph.tmpl Sun Mar 13 08:50:06 2011 -0500
+++ b/mercurial/templates/paper/graph.tmpl Sun Mar 13 15:59:50 2011 +0100
@@ -51,7 +51,7 @@
<div id="wrapper">
<ul id="nodebgs"></ul>
-<canvas id="graph" width="224" height="{canvasheight}"></canvas>
+<canvas id="graph" width="480" height="{canvasheight}"></canvas>
<ul id="graphnodes"></ul>
</div>
--- a/mercurial/templates/spartan/graph.tmpl Sun Mar 13 08:50:06 2011 -0500
+++ b/mercurial/templates/spartan/graph.tmpl Sun Mar 13 15:59:50 2011 +0100
@@ -32,7 +32,7 @@
<div id="wrapper">
<ul id="nodebgs"></ul>
-<canvas id="graph" width="224" height="{canvasheight}"></canvas>
+<canvas id="graph" width="480" height="{canvasheight}"></canvas>
<ul id="graphnodes"></ul>
</div>
--- a/tests/test-bookmarks-current.t Sun Mar 13 08:50:06 2011 -0500
+++ b/tests/test-bookmarks-current.t Sun Mar 13 15:59:50 2011 +0100
@@ -36,6 +36,10 @@
list bookmarks
+ $ cat .hg/bookmarks.current
+ Z (no-eol)
+ $ cat .hg/bookmarks
+ 0000000000000000000000000000000000000000 Z
$ hg bookmarks
* Z -1:000000000000
--- a/tests/test-hgweb-commands.t Sun Mar 13 08:50:06 2011 -0500
+++ b/tests/test-hgweb-commands.t Sun Mar 13 15:59:50 2011 +0100
@@ -807,7 +807,7 @@
<div id="wrapper">
<ul id="nodebgs"></ul>
- <canvas id="graph" width="224" height="129"></canvas>
+ <canvas id="graph" width="480" height="129"></canvas>
<ul id="graphnodes"></ul>
</div>
--- a/tests/test-hgweb-empty.t Sun Mar 13 08:50:06 2011 -0500
+++ b/tests/test-hgweb-empty.t Sun Mar 13 15:59:50 2011 +0100
@@ -232,7 +232,7 @@
<div id="wrapper">
<ul id="nodebgs"></ul>
- <canvas id="graph" width="224" height="12"></canvas>
+ <canvas id="graph" width="480" height="12"></canvas>
<ul id="graphnodes"></ul>
</div>