[PATCH] hgweb: add block numbers to diff regions and related links

Matt Mackall mpm at selenic.com
Thu Mar 29 14:21:59 CDT 2012


On Wed, 2012-03-28 at 19:35 -0500, Matt Mackall wrote:
> On Fri, 2012-03-23 at 01:33 +0100, Paul Boddie wrote:
> > # HG changeset patch
> > # User Paul Boddie <paul at boddie.org.uk>
> > # Date 1332462691 -3600
> > # Node ID 9261ec526f8d3f4654cffe5bb29ac4cb559d7179
> > # Parent  12e3f93b1cbc7c930e941f0adfe632c8ad70b73d
> > hgweb: add block numbers to diff regions and related links
> 
> Queued for default, thanks.

Looks like you added the command side of the script, but not its output.

To do this, run:

$ ./run-tests -i test--hgweb-diffs.t 

--- /home/mpm/hg/tests/test-hgweb-diffs.t 
+++ /home/mpm/hg/tests/test-hgweb-diffs.t.err 
@@ -575,6 +575,22 @@
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0'
+  200 Script output follows
+  
+  Block: 1
+  diff -r 000000000000 -r 0cd96de13884 a
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +a
+  
+  Block: 2
+  diff -r 000000000000 -r 0cd96de13884 b
+  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
+  @@ -0,0 +1,1 @@
+  +b
+  
   $ "$TESTDIR/killdaemons.py"
   $ rm .hg/hgrc rawdiff/map
   $ rmdir rawdiff

ERROR: /home/mpm/hg/tests/test-hgweb-diffs.t output changed
Accept this change? [n] y
!

..and now the test includes the output. Then run it again to make sure
there aren't any variable components in the output.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list