changeset 6476:ea230fb1c0e2

merge with main

--- a/contrib/dumprevlog	Fri Apr 04 23:18:03 2008 +0200
+++ b/contrib/dumprevlog	Sat Apr 05 00:04:50 2008 +0200
@@ -3,10 +3,14 @@
 # $ find .hg/store/ -name "*.i" | xargs dumprevlog > repo.dump
 
 import sys
-from mercurial import revlog, node
+from mercurial import revlog, node, util
+
+for fp in (sys.stdin, sys.stdout, sys.stderr):
+    util.set_binary(fp)
 
 for f in sys.argv[1:]:
-    r = revlog.revlog(open, f)
+    binopen = lambda fn: open(fn, 'rb')
+    r = revlog.revlog(binopen, f)
     print "file:", f
     for i in xrange(r.count()):
         n = r.node(i)

--- a/contrib/undumprevlog	Fri Apr 04 23:18:03 2008 +0200
+++ b/contrib/undumprevlog	Sat Apr 05 00:04:50 2008 +0200
@@ -6,6 +6,9 @@
 import sys
 from mercurial import revlog, node, util, transaction
 
+for fp in (sys.stdin, sys.stdout, sys.stderr):
+    util.set_binary(fp)
+
 opener = util.opener('.', False)
 tr = transaction.transaction(sys.stderr.write, opener, "undump.journal")
 while 1:

--- a/templates/coal/map	Fri Apr 04 23:18:03 2008 +0200
+++ b/templates/coal/map	Sat Apr 05 00:04:50 2008 +0200
@@ -20,8 +20,8 @@
 changeset = changeset.tmpl
 manifest = manifest.tmpl
 
-direntry = '<tr class="fileline parity{parity}"><td class="name"><img src="{staticurl}coal-folder.png"> <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
-fileentry = '<tr class="fileline parity{parity}"><td clase="filename"><img src="{staticurl}coal-file.png"> <a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}">{basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
+direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
+fileentry = '<tr class="fileline parity{parity}"><td clase="filename"><a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png"> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
 
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl

Binary file templates/static/coal-file.png has changed

Binary file templates/static/coal-folder.png has changed

--- a/templates/static/style-coal.css	Fri Apr 04 23:18:03 2008 +0200
+++ b/templates/static/style-coal.css	Sat Apr 05 00:04:50 2008 +0200
@@ -27,7 +27,7 @@
   padding: 10px;
   width: 75px;
   margin: 0;
-  font-size: 80% /*smaller*/;
+  font-size: 80%;
   text-align: left;
   position: fixed;
   top: 27px;
@@ -50,17 +50,18 @@
 }
 
 .menu li.active {
-  border-left: 3px solid black;
+  background: black;
+  color: white;
 }
 
+.menu a { color: black; display: block; }
+
 .search {
   position: absolute;
   top: .7em;
   right: 2em;
 }
 
-.menu a { color: black; display: block; }
-
 a { text-decoration:none; }
 .age { white-space:nowrap; }
 .date { white-space:nowrap; }
@@ -128,6 +129,7 @@
 .bigtable td.annotate { font-size: smaller; }
 
 .fileline { font-family: monospace; }
+.fileline img { border: 0; }
 
 /* Changeset entry */
 #changesetEntry { 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-dumprevlog	Sat Apr 05 00:04:50 2008 +0200
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+CONTRIBDIR=$TESTDIR/../contrib
+
+mkdir repo-a
+cd repo-a
+hg init
+
+echo this is file a > a
+hg add a
+hg commit -m first -d '0 0'
+
+echo adding to file a >> a
+hg commit -m second -d '0 0'
+
+echo adding more to file a >> a
+hg commit -m third -d '0 0'
+
+hg verify
+
+echo dumping revlog of file a to stdout:
+python $CONTRIBDIR/dumprevlog .hg/store/data/a.i
+echo dumprevlog done
+
+# dump all revlogs to file repo.dump
+find .hg/store/ -name "*.i" | xargs python $CONTRIBDIR/dumprevlog > ../repo.dump
+
+cd ..
+
+mkdir repo-b
+cd repo-b
+hg init
+
+echo undumping:
+python $CONTRIBDIR/undumprevlog < ../repo.dump
+echo undumping done
+
+hg verify
+
+cd ..
+
+echo comparing repos:
+hg -R repo-b incoming repo-a
+hg -R repo-a incoming repo-b
+echo comparing done
+
+exit 0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-dumprevlog.out	Sat Apr 05 00:04:50 2008 +0200
@@ -0,0 +1,53 @@
+checking changesets
+checking manifests
+crosschecking files in changesets and manifests
+checking files
+1 files, 3 changesets, 3 total revisions
+dumping revlog of file a to stdout:
+file: .hg/store/data/a.i
+node: 183d2312b35066fb6b3b449b84efc370d50993d0
+linkrev: 0
+parents: 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
+length: 15
+-start-
+this is file a
+
+-end-
+node: b1047953b6e6b633c0d8197eaa5116fbdfd3095b
+linkrev: 1
+parents: 183d2312b35066fb6b3b449b84efc370d50993d0 0000000000000000000000000000000000000000
+length: 32
+-start-
+this is file a
+adding to file a
+
+-end-
+node: 8c4fd1f7129b8cdec6c7f58bf48fb5237a4030c1
+linkrev: 2
+parents: b1047953b6e6b633c0d8197eaa5116fbdfd3095b 0000000000000000000000000000000000000000
+length: 54
+-start-
+this is file a
+adding to file a
+adding more to file a
+
+-end-
+dumprevlog done
+undumping:
+.hg/store/data/a.i
+.hg/store/00manifest.i
+.hg/store/00changelog.i
+undumping done
+checking changesets
+checking manifests
+crosschecking files in changesets and manifests
+checking files
+1 files, 3 changesets, 3 total revisions
+comparing repos:
+comparing with repo-a
+searching for changes
+no changes found
+comparing with repo-b
+searching for changes
+no changes found
+comparing done