Merge with TAH
authormpm@selenic.com
Sun, 14 Aug 2005 22:00:16 -0800
changeset 910 891b6a262c4b
parent 908 fcd34a9577e8 (diff)
parent 909 e2e7a2462ede (current diff)
child 911 d46af8e6b858
Merge with TAH
doc/hg.1.txt
mercurial/commands.py
tests/test-help.out
tests/test-notfound
tests/test-notfound.out
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -196,8 +196,11 @@ import [-p <n> -b <base> -q] <patches>::
 
     aliases: patch
 
-init::
-    Initialize a new repository in the current directory.
+init [dest]::
+    Initialize a new repository in the given directory.  If the given
+    directory does not exist, it is created.
+
+    If no directory is given, the current directory is used.
 
 locate [options] [files]::
     Print all files under Mercurial control whose names match the
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -772,12 +772,11 @@ def import_(ui, repo, patch1, *patches, 
             addremove(ui, repo, *files)
         repo.commit(files, message, user)
 
-def init(ui, source=None):
-    """create a new repository in the current directory"""
-
-    if source:
-        raise util.Abort("no longer supported: use \"hg clone\" instead")
-    hg.repository(ui, ".", create=1)
+def init(ui, dest="."):
+    """create a new repository in the given directory"""
+    if not os.path.exists(dest):
+        os.mkdir(dest)
+    hg.repository(ui, dest, create=1)
 
 def locate(ui, repo, *pats, **opts):
     """locate files matching specific patterns"""
@@ -1279,7 +1278,7 @@ table = {
          [('p', 'strip', 1, 'path strip'),
           ('b', 'base', "", 'base path')],
          "hg import [-p NUM] [-b BASE] PATCH..."),
-    "^init": (init, [], 'hg init'),
+    "^init": (init, [], 'hg init [DEST]'),
     "locate":
         (locate,
          [('r', 'rev', '', 'revision'),
--- a/tests/test-help.out
+++ b/tests/test-help.out
@@ -9,7 +9,7 @@ basic commands (use "hg help" for the fu
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
+ init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
@@ -25,7 +25,7 @@ basic commands (use "hg help" for the fu
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
+ init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
@@ -53,7 +53,7 @@ list of commands (use "hg help -v" to sh
  help        show help for a given command or all commands
  identify    print information about the working copy
  import      import an ordered set of patches
- init        create a new repository in the current directory
+ init        create a new repository in the given directory
  locate      locate files matching specific patterns
  log         show the revision history of the repository or a single file
  manifest    output the latest or given revision of the project manifest
@@ -90,7 +90,7 @@ list of commands (use "hg help -v" to sh
  help        show help for a given command or all commands
  identify    print information about the working copy
  import      import an ordered set of patches
- init        create a new repository in the current directory
+ init        create a new repository in the given directory
  locate      locate files matching specific patterns
  log         show the revision history of the repository or a single file
  manifest    output the latest or given revision of the project manifest
@@ -189,7 +189,7 @@ basic commands (use "hg help" for the fu
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
+ init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination
@@ -210,7 +210,7 @@ basic commands (use "hg help" for the fu
  commit     commit the specified files or all outstanding changes
  diff       diff working directory (or selected files)
  export     dump the header and diffs for one or more changesets
- init       create a new repository in the current directory
+ init       create a new repository in the given directory
  log        show the revision history of the repository or a single file
  pull       pull changes from the specified source
  push       push changes to the specified destination