# HG changeset patch # User Matt Mackall # Date 1285526492 18000 # Node ID 61be1503cfb236b2946e8602565aaed83932d024 # Parent 3cf40f64f9f6e71a2bc94e110feb09f9b4ddf68d tests: unify test-hgweb-diffs diff -r 3cf40f64f9f6 -r 61be1503cfb2 tests/test-hgweb-diffs --- a/tests/test-hgweb-diffs Sun Sep 26 13:41:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -#!/bin/sh - -echo % setting up repo -hg init test -cd test -echo a > a -echo b > b -hg ci -Ama - -echo % change permissions for git diffs -chmod 755 a -hg ci -Amb - -echo % set up hgweb -hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log -cat hg.pid >> $DAEMON_PIDS - -echo % revision -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' - -echo % raw revision -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' - -echo % diff removed file -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' - -echo % set up hgweb with git diffs -"$TESTDIR/killdaemons.py" -hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log -cat hg.pid >> $DAEMON_PIDS - -echo % revision -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' - -echo % revision -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' - -echo % diff removed file -"$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' - -cd .. -echo % test import rev as raw-rev -hg clone -r0 test test1 -cd test1 -hg import -q --exact http://localhost:$HGPORT/rev/1 - -echo % errors -cat ../test/errors.log diff -r 3cf40f64f9f6 -r 61be1503cfb2 tests/test-hgweb-diffs.out --- a/tests/test-hgweb-diffs.out Sun Sep 26 13:41:32 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,428 +0,0 @@ -% setting up repo -adding a -adding b -% change permissions for git diffs -% set up hgweb -% revision -200 Script output follows - - - - - - - - -test: 0cd96de13884 - - -
-
- - - -
    - -
-
- -
- -

test

-

changeset 0:0cd96de13884

- -
- -

-
find changesets by author, revision, -files, or words in the commit message
-
- -
a
- - - - - - - - - - - - - - - - - - - - - -
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children 78e4ebad7cdf
filesa b
- -
-
line diff
- -
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-     1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-     1.3 @@ -0,0 +1,1 @@
-     1.4 +a
-
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-     2.2 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
-     2.3 @@ -0,0 +1,1 @@
-     2.4 +b
-
-
- -
-
- - - - - -% raw revision -200 Script output follows - - -# HG changeset patch -# User test -# Date 0 0 -# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e - -a - -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 -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 - -% diff removed file -200 Script output follows - - - - - - - - -test: a diff - - - -
-
- - - - -
- -
-

test

-

diff a @ 1:78e4ebad7cdf

- -
-

-

-
find changesets by author, revision, -files, or words in the commit message
-
- -
b
- - - - - - - - - - - - - - - - - - - -
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children
- -
-
line diff
- -
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-     1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-     1.3 @@ -0,0 +1,1 @@
-     1.4 +a
-
-
-
-
- - - - - - -% set up hgweb with git diffs -% revision -200 Script output follows - - - - - - - - -test: 0cd96de13884 - - -
-
- - - -
    - -
-
- -
- -

test

-

changeset 0:0cd96de13884

- -
- -

-
find changesets by author, revision, -files, or words in the commit message
-
- -
a
- - - - - - - - - - - - - - - - - - - - - -
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children 78e4ebad7cdf
filesa b
- -
-
line diff
- -
     1.1 new file mode 100644
-     1.2 --- /dev/null
-     1.3 +++ b/a
-     1.4 @@ -0,0 +1,1 @@
-     1.5 +a
-
     2.1 new file mode 100644
-     2.2 --- /dev/null
-     2.3 +++ b/b
-     2.4 @@ -0,0 +1,1 @@
-     2.5 +b
-
-
- -
-
- - - - - -% revision -200 Script output follows - - -# HG changeset patch -# User test -# Date 0 0 -# Node ID 0cd96de13884b090099512d4794ae87ad067ea8e - -a - -diff --git a/a b/a -new file mode 100644 ---- /dev/null -+++ b/a -@@ -0,0 +1,1 @@ -+a -diff --git a/b b/b -new file mode 100644 ---- /dev/null -+++ b/b -@@ -0,0 +1,1 @@ -+b - -% diff removed file -200 Script output follows - - - - - - - - -test: a diff - - - -
-
- - - - -
- -
-

test

-

diff a @ 1:78e4ebad7cdf

- -
-

-

-
find changesets by author, revision, -files, or words in the commit message
-
- -
b
- - - - - - - - - - - - - - - - - - - -
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children
- -
-
line diff
- -
     1.1 new file mode 100755
-     1.2 --- /dev/null
-     1.3 +++ b/a
-     1.4 @@ -0,0 +1,1 @@
-     1.5 +a
-
-
-
-
- - - - - - -% test import rev as raw-rev -requesting all changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 2 changes to 2 files -updating to branch default -2 files updated, 0 files merged, 0 files removed, 0 files unresolved -% errors diff -r 3cf40f64f9f6 -r 61be1503cfb2 tests/test-hgweb-diffs.t --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-hgweb-diffs.t Sun Sep 26 13:41:32 2010 -0500 @@ -0,0 +1,474 @@ +setting up repo + + $ hg init test + $ cd test + $ echo a > a + $ echo b > b + $ hg ci -Ama + adding a + adding b + +change permissions for git diffs + + $ chmod 755 a + $ hg ci -Amb + +set up hgweb + + $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + $ cat hg.pid >> $DAEMON_PIDS + +revision + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' + 200 Script output follows + + + + + + + + + test: 0cd96de13884 + + +
+
+ + + +
    + +
+
+ +
+ +

test

+

changeset 0:0cd96de13884

+ +
+ +

+
find changesets by author, revision, + files, or words in the commit message
+
+ +
a
+ + + + + + + + + + + + + + + + + + + + + +
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children 78e4ebad7cdf
filesa b
+ +
+
line diff
+ + 
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+       1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
+       1.3 @@ -0,0 +1,1 @@
+       1.4 +a
+  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+       2.2 +++ b/b	Thu Jan 01 00:00:00 1970 +0000
+       2.3 @@ -0,0 +1,1 @@
+       2.4 +b
+
+
+ +
+
+ + + + + + +raw revision + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' + 200 Script output follows + + + # HG changeset patch + # User test + # Date 0 0 + # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e + + a + + 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 + 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 + + +diff removed file + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' + 200 Script output follows + + + + + + + + + test: a diff + + + +
+
+ + + + +
+ +
+

test

+

diff a @ 1:78e4ebad7cdf

+ +
+

+

+
find changesets by author, revision, + files, or words in the commit message
+
+ +
b
+ + + + + + + + + + + + + + + + + + + +
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children
+ +
+
line diff
+ + 
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+       1.2 +++ b/a	Thu Jan 01 00:00:00 1970 +0000
+       1.3 @@ -0,0 +1,1 @@
+       1.4 +a
+
+
+
+
+ + + + + + + +set up hgweb with git diffs + + $ "$TESTDIR/killdaemons.py" + $ hg serve --config 'diff.git=1' -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log + $ cat hg.pid >> $DAEMON_PIDS + +revision + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/0' + 200 Script output follows + + + + + + + + + test: 0cd96de13884 + + +
+
+ + + +
    + +
+
+ +
+ +

test

+

changeset 0:0cd96de13884

+ +
+ +

+
find changesets by author, revision, + files, or words in the commit message
+
+ +
a
+ + + + + + + + + + + + + + + + + + + + + +
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children 78e4ebad7cdf
filesa b
+ +
+
line diff
+ + 
     1.1 new file mode 100644
+       1.2 --- /dev/null
+       1.3 +++ b/a
+       1.4 @@ -0,0 +1,1 @@
+       1.5 +a
+  
     2.1 new file mode 100644
+       2.2 --- /dev/null
+       2.3 +++ b/b
+       2.4 @@ -0,0 +1,1 @@
+       2.5 +b
+
+
+ +
+
+ + + + + + +revision + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/raw-rev/0' + 200 Script output follows + + + # HG changeset patch + # User test + # Date 0 0 + # Node ID 0cd96de13884b090099512d4794ae87ad067ea8e + + a + + diff --git a/a b/a + new file mode 100644 + --- /dev/null + +++ b/a + @@ -0,0 +1,1 @@ + +a + diff --git a/b b/b + new file mode 100644 + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +b + + +diff removed file + + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/tip/a' + 200 Script output follows + + + + + + + + + test: a diff + + + +
+
+ + + + +
+ +
+

test

+

diff a @ 1:78e4ebad7cdf

+ +
+

+

+
find changesets by author, revision, + files, or words in the commit message
+
+ +
b
+ + + + + + + + + + + + + + + + + + + +
authortest
dateThu Jan 01 00:00:00 1970 +0000 (1970-01-01)
parents
children
+ +
+
line diff
+ + 
     1.1 new file mode 100755
+       1.2 --- /dev/null
+       1.3 +++ b/a
+       1.4 @@ -0,0 +1,1 @@
+       1.5 +a
+
+
+
+
+ + + + + + + $ cd .. + +test import rev as raw-rev + + $ hg clone -r0 test test1 + requesting all changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 2 changes to 2 files + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd test1 + $ hg import -q --exact http://localhost:$HGPORT/rev/1 + +errors + + $ cat ../test/errors.log