changeset 12511:0fefeb4fff49

tests: unify test-convert-authormap
author Matt Mackall <mpm@selenic.com>
date Sun, 26 Sep 2010 14:33:08 -0500
parents efcbff270317
children 8d84166d34d7
files tests/test-convert-authormap tests/test-convert-authormap.out tests/test-convert-authormap.t tests/test-convert.t
diffstat 3 files changed, 58 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-authormap	Sun Sep 26 14:32:13 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-cat >> $HGRCPATH <<EOF
-[extensions]
-convert=
-EOF
-
-# Prepare orig repo
-hg init orig
-cd orig
-echo foo > foo
-HGUSER='user name' hg ci -qAm 'foo'
-cd ..
-
-# Explicit --authors
-cat > authormap.txt <<EOF
-user name = Long User Name
-
-# comment
-this line is ignored
-EOF
-
-hg convert --authors authormap.txt orig new
-echo $?
-cat new/.hg/authormap
-
-hg -Rnew log
-rm -rf new
-
-# Implicit .hg/authormap
-hg init new
-mv authormap.txt new/.hg/authormap
-
-hg convert orig new
-echo $?
-
-hg -Rnew log
--- a/tests/test-convert-authormap.out	Sun Sep 26 14:32:13 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-initializing destination new repository
-Ignoring bad line in author map file authormap.txt: this line is ignored
-scanning source...
-sorting...
-converting...
-0 foo
-Writing author map file new/.hg/authormap
-0
-user name=Long User Name
-changeset:   0:d89716e88087
-tag:         tip
-user:        Long User Name
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     foo
-
-Ignoring bad line in author map file new/.hg/authormap: this line is ignored
-scanning source...
-sorting...
-converting...
-0 foo
-0
-changeset:   0:d89716e88087
-tag:         tip
-user:        Long User Name
-date:        Thu Jan 01 00:00:00 1970 +0000
-summary:     foo
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-convert-authormap.t	Sun Sep 26 14:33:08 2010 -0500
@@ -0,0 +1,58 @@
+
+  $ cat >> $HGRCPATH <<EOF
+  > [extensions]
+  > convert=
+  > EOF
+
+Prepare orig repo
+
+  $ hg init orig
+  $ cd orig
+  $ echo foo > foo
+  $ HGUSER='user name' hg ci -qAm 'foo'
+  $ cd ..
+
+Explicit --authors
+
+  $ cat > authormap.txt <<EOF
+  > user name = Long User Name
+  > 
+  > # comment
+  > this line is ignored
+  > EOF
+  $ hg convert --authors authormap.txt orig new
+  initializing destination new repository
+  Ignoring bad line in author map file authormap.txt: this line is ignored
+  scanning source...
+  sorting...
+  converting...
+  0 foo
+  Writing author map file new/.hg/authormap
+  $ cat new/.hg/authormap
+  user name=Long User Name
+  $ hg -Rnew log
+  changeset:   0:d89716e88087
+  tag:         tip
+  user:        Long User Name
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     foo
+  
+  $ rm -rf new
+
+Implicit .hg/authormap
+
+  $ hg init new
+  $ mv authormap.txt new/.hg/authormap
+  $ hg convert orig new
+  Ignoring bad line in author map file new/.hg/authormap: this line is ignored
+  scanning source...
+  sorting...
+  converting...
+  0 foo
+  $ hg -Rnew log
+  changeset:   0:d89716e88087
+  tag:         tip
+  user:        Long User Name
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  summary:     foo
+