##// END OF EJS Templates
merge with stable
Benoit Boissinot -
r13623:0e217d47 merge default
parent child Browse files
Show More
@@ -509,9 +509,9 b' def bookmark(ui, repo, mark=None, rev=No'
509 if mark is None:
509 if mark is None:
510 raise util.Abort(_("new bookmark name required"))
510 raise util.Abort(_("new bookmark name required"))
511 marks[mark] = marks[rename]
511 marks[mark] = marks[rename]
512 del marks[rename]
513 if repo._bookmarkcurrent == rename:
512 if repo._bookmarkcurrent == rename:
514 bookmarks.setcurrent(repo, mark)
513 bookmarks.setcurrent(repo, mark)
514 del marks[rename]
515 bookmarks.write(repo)
515 bookmarks.write(repo)
516 return
516 return
517
517
@@ -39,7 +39,7 b' graph |'
39
39
40 <div id="wrapper">
40 <div id="wrapper">
41 <ul id="nodebgs"></ul>
41 <ul id="nodebgs"></ul>
42 <canvas id="graph" width="224" height="{canvasheight}"></canvas>
42 <canvas id="graph" width="480" height="{canvasheight}"></canvas>
43 <ul id="graphnodes"></ul>
43 <ul id="graphnodes"></ul>
44 </div>
44 </div>
45
45
@@ -35,7 +35,7 b''
35 <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
35 <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
36 <div id="wrapper">
36 <div id="wrapper">
37 <ul id="nodebgs"></ul>
37 <ul id="nodebgs"></ul>
38 <canvas id="graph" width="224" height="{canvasheight}"></canvas>
38 <canvas id="graph" width="480" height="{canvasheight}"></canvas>
39 <ul id="graphnodes"></ul>
39 <ul id="graphnodes"></ul>
40 </div>
40 </div>
41
41
@@ -51,7 +51,7 b' files, or words in the commit message</d'
51
51
52 <div id="wrapper">
52 <div id="wrapper">
53 <ul id="nodebgs"></ul>
53 <ul id="nodebgs"></ul>
54 <canvas id="graph" width="224" height="{canvasheight}"></canvas>
54 <canvas id="graph" width="480" height="{canvasheight}"></canvas>
55 <ul id="graphnodes"></ul>
55 <ul id="graphnodes"></ul>
56 </div>
56 </div>
57
57
@@ -32,7 +32,7 b' navigate: <small class="navigate">{chang'
32
32
33 <div id="wrapper">
33 <div id="wrapper">
34 <ul id="nodebgs"></ul>
34 <ul id="nodebgs"></ul>
35 <canvas id="graph" width="224" height="{canvasheight}"></canvas>
35 <canvas id="graph" width="480" height="{canvasheight}"></canvas>
36 <ul id="graphnodes"></ul>
36 <ul id="graphnodes"></ul>
37 </div>
37 </div>
38
38
@@ -36,6 +36,10 b' rename'
36
36
37 list bookmarks
37 list bookmarks
38
38
39 $ cat .hg/bookmarks.current
40 Z (no-eol)
41 $ cat .hg/bookmarks
42 0000000000000000000000000000000000000000 Z
39 $ hg bookmarks
43 $ hg bookmarks
40 * Z -1:000000000000
44 * Z -1:000000000000
41
45
@@ -807,7 +807,7 b' Overviews'
807
807
808 <div id="wrapper">
808 <div id="wrapper">
809 <ul id="nodebgs"></ul>
809 <ul id="nodebgs"></ul>
810 <canvas id="graph" width="224" height="129"></canvas>
810 <canvas id="graph" width="480" height="129"></canvas>
811 <ul id="graphnodes"></ul>
811 <ul id="graphnodes"></ul>
812 </div>
812 </div>
813
813
@@ -232,7 +232,7 b' Some tests for hgweb in an empty reposit'
232
232
233 <div id="wrapper">
233 <div id="wrapper">
234 <ul id="nodebgs"></ul>
234 <ul id="nodebgs"></ul>
235 <canvas id="graph" width="224" height="12"></canvas>
235 <canvas id="graph" width="480" height="12"></canvas>
236 <ul id="graphnodes"></ul>
236 <ul id="graphnodes"></ul>
237 </div>
237 </div>
238
238
General Comments 0
You need to be logged in to leave comments. Login now