# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1184526338 -7200
# Node ID d77accdd236e52c21496b843acda0091d099780a
# Parent  2a01e03ffacdd9f66b205e4b3b9efa097027d6da# Parent  72ac66e88c43e01f99a735f9dc37d012c32331c2
merge with crew-stable

diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py
--- a/hgext/convert/__init__.py
+++ b/hgext/convert/__init__.py
@@ -274,12 +274,14 @@ def _convert(ui, src, dest=None, mapfile
     convert will only import up to the named revision (given in a format
     understood by the source).
 
-    If destination isn't given, a new Mercurial repo named <src>-hg will
-    be created. If <mapfile> isn't given, it will be put in a default
-    location (<dest>/.hg/shamap by default)
+    If no destination directory name is specified, it defaults to the
+    basename of the source with '-hg' appended.  If the destination
+    repository doesn't exist, it will be created.
 
-    The <mapfile> is a simple text file that maps each source commit ID to
-    the destination ID for that revision, like so:
+    If <mapfile> isn't given, it will be put in a default location
+    (<dest>/.hg/shamap by default).  The <mapfile> is a simple text
+    file that maps each source commit ID to the destination ID for
+    that revision, like so:
     <source ID> <destination ID>
 
     If the file doesn't exist, it's automatically created.  It's updated
@@ -294,7 +296,7 @@ def _convert(ui, src, dest=None, mapfile
     '''
 
     if not dest:
-        dest = src + "-hg"
+        dest = hg.defaultdest(src) + "-hg"
         ui.status("assuming destination %s\n" % dest)
 
     # Try to be smart and initalize things when required