merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Tue, 05 Feb 2008 15:59:10 +0100
changeset 6020 20b05618b3e2
parent 6018 404be894cf71 (current diff)
parent 6019 b70a530bdb93 (diff)
child 6021 717881b400b3
child 6035 df659eb23360
merge with crew-stable
mercurial/archival.py
tests/test-archive
tests/test-archive.out
--- a/mercurial/archival.py	Tue Feb 05 14:34:46 2008 +0100
+++ b/mercurial/archival.py	Tue Feb 05 15:59:10 2008 +0100
@@ -208,6 +208,8 @@
         archiver.addfile(name, mode, islink, data)
 
     ctx = repo.changectx(node)
+    if kind not in archivers:
+        raise util.Abort(_("unknown archive type '%s'" % kind))
     archiver = archivers[kind](dest, prefix, mtime or ctx.date()[0])
     m = ctx.manifest()
     items = m.items()
--- a/tests/test-archive	Tue Feb 05 14:34:46 2008 +0100
+++ b/tests/test-archive	Tue Feb 05 15:59:10 2008 +0100
@@ -69,6 +69,8 @@
     echo 'rev-0.tar created'
 fi
 
+hg archive -t bogus test.bogus
+
 echo % server errors
 cat errors.log
 
--- a/tests/test-archive.out	Tue Feb 05 14:34:46 2008 +0100
+++ b/tests/test-archive.out	Tue Feb 05 15:59:10 2008 +0100
@@ -39,6 +39,7 @@
 test-TIP/baz/bletch
 test-TIP/foo
 rev-0.tar created
+abort: unknown archive type 'bogus'
 % server errors
 % empty repo
 abort: repository has no revisions