Mercurial > hg-stable

changeset 12464:3177e3a7b14f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-mq-qimport
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Sep 2010 13:43:21 -0500
parents 9f551ca3bb44
children 8b12768b15e2
files tests/test-mq-qimport tests/test-mq-qimport.out tests/test-mq-qimport.t
diffstat 3 files changed, 203 insertions(+), 199 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-mq-qimport	Sun Sep 26 13:43:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-#!/bin/sh
-
-cat > writelines.py <<EOF
-import sys
-path = sys.argv[1]
-args = sys.argv[2:]
-assert (len(args) % 2) == 0
-
-f = file(path, 'wb')
-for i in xrange(len(args)/2):
-   count, s = args[2*i:2*i+2]
-   count = int(count)
-   s = s.decode('string_escape')
-   f.write(s*count)
-f.close()
-
-EOF
-
-echo "[extensions]" >> $HGRCPATH
-echo "mq=" >> $HGRCPATH
-echo "[diff]" >> $HGRCPATH
-echo "git=1" >> $HGRCPATH
-
-hg init repo
-cd repo
-
-echo % qimport non-existing-file
-hg qimport non-existing-file
-
-echo % import email
-hg qimport --push -n email - <<EOF
-From: Username in email <test@example.net>
-Subject: [PATCH] Message in email
-Date: Fri, 02 Jan 1970 00:00:00 +0000
-
-Text before patch.
-
-# HG changeset patch
-# User Username in patch <test@example.net>
-# Date 0 0
-# Node ID 1a706973a7d84cb549823634a821d9bdf21c6220
-# Parent  0000000000000000000000000000000000000000
-First line of commit message.
-
-More text in commit message.
---- confuse the diff detection
-
-diff --git a/x b/x
-new file mode 100644
---- /dev/null
-+++ b/x
-@@ -0,0 +1,1 @@
-+new file
-Text after patch.
-
-EOF
-
-echo % hg tip -v
-hg tip -v
-hg qpop
-hg qdelete email
-
-echo % import URL
-echo foo >> foo
-hg add foo
-hg diff > $HGTMP/url.diff
-hg revert --no-backup foo
-rm foo
-# Under unix: file:///foobar/blah
-# Under windows: file:///c:/foobar/blah
-patchurl=`echo "$HGTMP"/url.diff | tr '\\\\' /`
-expr "$patchurl" : "\/" > /dev/null
-if [ $? -ne 0 ]; then
-    patchurl="/$patchurl"
-fi
-hg qimport file://"$patchurl"
-hg qun
-
-echo % import patch that already exists
-echo foo2 >> foo
-hg add foo
-hg diff > ../url.diff
-hg revert --no-backup foo
-rm foo
-hg qimport ../url.diff
-hg qpush
-cat foo
-hg qpop
-echo % qimport -f
-hg qimport -f ../url.diff
-hg qpush
-cat foo
-hg qpop
-
-echo % build diff with CRLF
-python ../writelines.py b 5 'a\n' 5 'a\r\n'
-hg ci -Am addb
-python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n'
-hg diff > b.diff
-hg up -C
-echo % qimport CRLF diff
-hg qimport b.diff
-hg qpush
-
-echo % try to import --push
-echo another >> b
-hg diff > another.diff
-hg up -C
-hg qimport --push another.diff
-hg qfin -a
-hg qimport -rtip -P
-
-hg qpop -a
-hg qdel -k 2.diff
-echo % qimport -e
-hg qimport -e 2.diff
-hg qdel -k 2.diff
-echo % qimport -e --name newname oldexisitingpatch
-hg qimport -e --name this-name-is-better 2.diff
-hg qser
-echo % qimport -e --name without --force
-cp .hg/patches/this-name-is-better .hg/patches/3.diff
-hg qimport -e --name this-name-is-better 3.diff
-hg qser
-echo % qimport -e --name with --force
-hg qimport --force -e --name this-name-is-better 3.diff
-hg qser
--- a/tests/test-mq-qimport.out	Sun Sep 26 13:43:21 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-% qimport non-existing-file
-abort: unable to read file non-existing-file
-% import email
-adding email to series file
-applying email
-now at: email
-% hg tip -v
-changeset:   0:1a706973a7d8
-tag:         email
-tag:         qbase
-tag:         qtip
-tag:         tip
-user:        Username in patch <test@example.net>
-date:        Thu Jan 01 00:00:00 1970 +0000
-files:       x
-description:
-First line of commit message.
-
-More text in commit message.
-
-
-popping email
-patch queue now empty
-% import URL
-adding url.diff to series file
-url.diff
-% import patch that already exists
-abort: patch "url.diff" already exists
-applying url.diff
-now at: url.diff
-foo
-popping url.diff
-patch queue now empty
-% qimport -f
-adding url.diff to series file
-applying url.diff
-now at: url.diff
-foo2
-popping url.diff
-patch queue now empty
-% build diff with CRLF
-adding b
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% qimport CRLF diff
-adding b.diff to series file
-applying b.diff
-now at: b.diff
-% try to import --push
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-adding another.diff to series file
-applying another.diff
-now at: another.diff
-patch b.diff finalized without changeset message
-patch another.diff finalized without changeset message
-popping 2.diff
-patch queue now empty
-% qimport -e
-adding 2.diff to series file
-% qimport -e --name newname oldexisitingpatch
-renaming 2.diff to this-name-is-better
-adding this-name-is-better to series file
-this-name-is-better
-url.diff
-% qimport -e --name without --force
-abort: patch "this-name-is-better" already exists
-this-name-is-better
-url.diff
-% qimport -e --name with --force
-renaming 3.diff to this-name-is-better
-adding this-name-is-better to series file
-this-name-is-better
-url.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-mq-qimport.t	Sun Sep 26 13:43:21 2010 -0500
@@ -0,0 +1,203 @@
+
+  $ cat > writelines.py <<EOF
+  > import sys
+  > path = sys.argv[1]
+  > args = sys.argv[2:]
+  > assert (len(args) % 2) == 0
+  > 
+  > f = file(path, 'wb')
+  > for i in xrange(len(args)/2):
+  >    count, s = args[2*i:2*i+2]
+  >    count = int(count)
+  >    s = s.decode('string_escape')
+  >    f.write(s*count)
+  > f.close()
+  > 
+  > EOF
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "mq=" >> $HGRCPATH
+  $ echo "[diff]" >> $HGRCPATH
+  $ echo "git=1" >> $HGRCPATH
+  $ hg init repo
+  $ cd repo
+
+qimport non-existing-file
+
+  $ hg qimport non-existing-file
+  abort: unable to read file non-existing-file
+  [255]
+
+import email
+
+  $ hg qimport --push -n email - <<EOF
+  > From: Username in email <test@example.net>
+  > Subject: [PATCH] Message in email
+  > Date: Fri, 02 Jan 1970 00:00:00 +0000
+  > 
+  > Text before patch.
+  > 
+  > # HG changeset patch
+  > # User Username in patch <test@example.net>
+  > # Date 0 0
+  > # Node ID 1a706973a7d84cb549823634a821d9bdf21c6220
+  > # Parent  0000000000000000000000000000000000000000
+  > First line of commit message.
+  > 
+  > More text in commit message.
+  > --- confuse the diff detection
+  > 
+  > diff --git a/x b/x
+  > new file mode 100644
+  > --- /dev/null
+  > +++ b/x
+  > @@ -0,0 +1,1 @@
+  > +new file
+  > Text after patch.
+  > 
+  > EOF
+  adding email to series file
+  applying email
+  now at: email
+
+hg tip -v
+
+  $ hg tip -v
+  changeset:   0:1a706973a7d8
+  tag:         email
+  tag:         qbase
+  tag:         qtip
+  tag:         tip
+  user:        Username in patch <test@example.net>
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  files:       x
+  description:
+  First line of commit message.
+  
+  More text in commit message.
+  
+  
+  $ hg qpop
+  popping email
+  patch queue now empty
+  $ hg qdelete email
+
+import URL
+
+  $ echo foo >> foo
+  $ hg add foo
+  $ hg diff > $HGTMP/url.diff
+  $ hg revert --no-backup foo
+  $ rm foo
+
+Under unix: file:///foobar/blah
+Under windows: file:///c:/foobar/blah
+
+  $ patchurl=`echo "$HGTMP"/url.diff | tr '\\\\' /`
+  $ expr "$patchurl" : "\/" > /dev/null || patchurl="/$patchurl"
+  $ hg qimport file://"$patchurl"
+  adding url.diff to series file
+  $ hg qun
+  url.diff
+
+import patch that already exists
+
+  $ echo foo2 >> foo
+  $ hg add foo
+  $ hg diff > ../url.diff
+  $ hg revert --no-backup foo
+  $ rm foo
+  $ hg qimport ../url.diff
+  abort: patch "url.diff" already exists
+  [255]
+  $ hg qpush
+  applying url.diff
+  now at: url.diff
+  $ cat foo
+  foo
+  $ hg qpop
+  popping url.diff
+  patch queue now empty
+
+qimport -f
+
+  $ hg qimport -f ../url.diff
+  adding url.diff to series file
+  $ hg qpush
+  applying url.diff
+  now at: url.diff
+  $ cat foo
+  foo2
+  $ hg qpop
+  popping url.diff
+  patch queue now empty
+
+build diff with CRLF
+
+  $ python ../writelines.py b 5 'a\n' 5 'a\r\n'
+  $ hg ci -Am addb
+  adding b
+  $ python ../writelines.py b 2 'a\n' 10 'b\n' 2 'a\r\n'
+  $ hg diff > b.diff
+  $ hg up -C
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+qimport CRLF diff
+
+  $ hg qimport b.diff
+  adding b.diff to series file
+  $ hg qpush
+  applying b.diff
+  now at: b.diff
+
+try to import --push
+
+  $ echo another >> b
+  $ hg diff > another.diff
+  $ hg up -C
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg qimport --push another.diff
+  adding another.diff to series file
+  applying another.diff
+  now at: another.diff
+  $ hg qfin -a
+  patch b.diff finalized without changeset message
+  patch another.diff finalized without changeset message
+  $ hg qimport -rtip -P
+  $ hg qpop -a
+  popping 2.diff
+  patch queue now empty
+  $ hg qdel -k 2.diff
+
+qimport -e
+
+  $ hg qimport -e 2.diff
+  adding 2.diff to series file
+  $ hg qdel -k 2.diff
+
+qimport -e --name newname oldexisitingpatch
+
+  $ hg qimport -e --name this-name-is-better 2.diff
+  renaming 2.diff to this-name-is-better
+  adding this-name-is-better to series file
+  $ hg qser
+  this-name-is-better
+  url.diff
+
+qimport -e --name without --force
+
+  $ cp .hg/patches/this-name-is-better .hg/patches/3.diff
+  $ hg qimport -e --name this-name-is-better 3.diff
+  abort: patch "this-name-is-better" already exists
+  [255]
+  $ hg qser
+  this-name-is-better
+  url.diff
+
+qimport -e --name with --force
+
+  $ hg qimport --force -e --name this-name-is-better 3.diff
+  renaming 3.diff to this-name-is-better
+  adding this-name-is-better to series file
+  $ hg qser
+  this-name-is-better
+  url.diff