# HG changeset patch
# User Nicolas Dumazet <nicdumz.commits@gmail.com>
# Date 1283145216 -32400
# Node ID 46ab8c5dd99a5584e1179e72c5a2f51379db850c
# Parent  ab2ccdce985d07e4b6c393b732afea746fe61448
tests: unify test-impexp-branch

diff -r ab2ccdce985d -r 46ab8c5dd99a tests/test-impexp-branch
--- a/tests/test-impexp-branch	Mon Aug 30 14:10:31 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-cat >findbranch.py <<EOF
-import re, sys
-
-head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')
-
-for line in sys.stdin:
-    hmatch = head_re.match(line)
-    if not hmatch:
-        sys.exit(1)
-    if hmatch.group(1) == 'Branch':
-        sys.exit(0)
-sys.exit(1)
-EOF
-hg init a
-cd a
-echo "Rev 1" >rev
-hg add rev
-hg commit -m "No branch."
-hg branch abranch
-echo "Rev  2" >rev
-hg commit -m "With branch."
-if hg export 0 | python ../findbranch.py; then
-    echo "Export of default branch revision has Branch header" 1>&2
-    exit 1
-fi
-if hg export 1 | python ../findbranch.py; then
-    :  # Do nothing
-else
-    echo "Export of branch revision is missing Branch header" 1>&2
-    exit 1
-fi
-# Make sure import still works with branch information in patches.
-cd ..
-hg init b
-cd b
-hg -R ../a export 0 | hg import -
-hg -R ../a export 1 | hg import -
-cd ..
-rm -rf b
-hg init b
-cd b
-hg -R ../a export 0 | hg import --exact -
-hg -R ../a export 1 | hg import --exact -
diff -r ab2ccdce985d -r 46ab8c5dd99a tests/test-impexp-branch.out
--- a/tests/test-impexp-branch.out	Mon Aug 30 14:10:31 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-marked working directory as branch abranch
-applying patch from stdin
-applying patch from stdin
-applying patch from stdin
-applying patch from stdin
diff -r ab2ccdce985d -r 46ab8c5dd99a tests/test-impexp-branch.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-impexp-branch.t	Mon Aug 30 14:13:36 2010 +0900
@@ -0,0 +1,50 @@
+  $ cat >findbranch.py <<EOF
+  > import re, sys
+  > 
+  > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')
+  > 
+  > for line in sys.stdin:
+  >     hmatch = head_re.match(line)
+  >     if not hmatch:
+  >         sys.exit(1)
+  >     if hmatch.group(1) == 'Branch':
+  >         sys.exit(0)
+  > sys.exit(1)
+  > EOF
+  $ hg init a
+  $ cd a
+  $ echo "Rev 1" >rev
+  $ hg add rev
+  $ hg commit -m "No branch."
+  $ hg branch abranch
+  marked working directory as branch abranch
+  $ echo "Rev  2" >rev
+  $ hg commit -m "With branch."
+  $ if hg export 0 | python ../findbranch.py; then
+  >     echo "Export of default branch revision has Branch header" 1>&2
+  >     exit 1
+  > fi
+  $ if hg export 1 | python ../findbranch.py; then
+  >     :  # Do nothing
+  > else
+  >     echo "Export of branch revision is missing Branch header" 1>&2
+  >     exit 1
+  > fi
+
+Make sure import still works with branch information in patches.
+
+  $ cd ..
+  $ hg init b
+  $ cd b
+  $ hg -R ../a export 0 | hg import -
+  applying patch from stdin
+  $ hg -R ../a export 1 | hg import -
+  applying patch from stdin
+  $ cd ..
+  $ rm -rf b
+  $ hg init b
+  $ cd b
+  $ hg -R ../a export 0 | hg import --exact -
+  applying patch from stdin
+  $ hg -R ../a export 1 | hg import --exact -
+  applying patch from stdin