Add the --reject option to fold

[stgit] / stgit / commands / clone.py

diff --git a/stgit/commands/clone.py b/stgit/commands/clone.py
index d2c68bb37cefdf9f17618cfca808761cd8ad2866..9e39c5475138ef0ea056b2e8acdfd1812d5ca1f7 100644 (file)
--- a/stgit/commands/clone.py
+++ b/stgit/commands/clone.py
@@ -1,5 +1,5 @@
 __copyright__ = """
 __copyright__ = """

-Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
+Copyright (C) 2009, Catalin Marinas <catalin.marinas@gmail.com>

 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License version 2 as


@@ -15,28 +15,31 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 

-import sys, os
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import stack, git
+import os
+from stgit.commands import common
+from stgit.lib import git, stack
+from stgit import argparse
+from stgit.out import out

 
 help = 'Make a local clone of a remote repository'
 
 help = 'Make a local clone of a remote repository'

+kind = 'repo'

 usage = ['<repository> <dir>']
 description = """
 Clone a git repository into the local directory <dir> (using
 usage = ['<repository> <dir>']
 description = """
 Clone a git repository into the local directory <dir> (using

-gitlink:clone[]) and initialise the local branch "master".
+linkstg:clone[]) and initialise the local branch "master".

 
 This operation is for example suitable to start working using the
 
 This operation is for example suitable to start working using the

-"tracking branch" workflow (see gitlink:stg[1]). Other means to setup
-an StGit stack are stglink:init[] and the '--create' and '--clone'
-commands of stglink:branch[].
+"tracking branch" workflow (see link:stg[1]). Other means to setup
+an StGit stack are linkstg:init[] and the '--create' and '--clone'
+commands of linkstg:branch[].

 
 The target directory <dir> will be created by this command, and must
 not already exist."""
 
 
 The target directory <dir> will be created by this command, and must
 not already exist."""
 

+args = [argparse.repo, argparse.dir]

 options = []
 
 options = []
 

-directory = DirectoryAnywhere(needs_current_series = False)
+directory = common.DirectoryAnywhere(needs_current_series = False, log = False)

 
 def func(parser, options, args):
     """Clone the <repository> into the local <dir> and initialises the
 
 def func(parser, options, args):
     """Clone the <repository> into the local <dir> and initialises the


@@ -49,17 +52,10 @@ def func(parser, options, args):
     local_dir = args[1]
 
     if os.path.exists(local_dir):
     local_dir = args[1]
 
     if os.path.exists(local_dir):

-        raise CmdException, '"%s" exists. Remove it first' % local_dir
-
-    print 'Cloning "%s" into "%s"...' % (repository, local_dir)
+        raise common.CmdException('"%s" exists. Remove it first' % local_dir)

 
     git.clone(repository, local_dir)
     os.chdir(local_dir)
 
     git.clone(repository, local_dir)
     os.chdir(local_dir)

-    git.checkout(tree_id = 'HEAD')
-
-    # be sure to forget any cached value for .git, since we're going
-    # to work on a brand new repository
-    basedir.clear_cache()
-    stack.Series().init()
-
-    print 'done'
+    directory = common.DirectoryHasRepositoryLib()
+    directory.setup()
+    stack.Stack.initialise(directory.repository)