From: Catalin Marinas Date: Fri, 22 May 2009 08:53:37 +0000 (+0100) Subject: Convert 'clone' to the use stgit.lib X-Git-Tag: v0.15-rc1~19 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/78b90cedb2b868eeed63de3d0b21d1f9059930d8?ds=sidebyside Convert 'clone' to the use stgit.lib The patch also adds the stgit.lib.git.clone() function. Signed-off-by: Catalin Marinas --- diff --git a/stgit/commands/clone.py b/stgit/commands/clone.py index 7fe9c35..9e39c54 100644 --- a/stgit/commands/clone.py +++ b/stgit/commands/clone.py @@ -1,5 +1,5 @@ __copyright__ = """ -Copyright (C) 2005, Catalin Marinas +Copyright (C) 2009, Catalin Marinas 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,10 +15,11 @@ along with this program; if not, write to the Free Software 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 argparse, 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' kind = 'repo' @@ -38,7 +39,7 @@ not already exist.""" args = [argparse.repo, argparse.dir] options = [] -directory = DirectoryAnywhere(needs_current_series = False, log = False) +directory = common.DirectoryAnywhere(needs_current_series = False, log = False) def func(parser, options, args): """Clone the into the local and initialises the @@ -51,17 +52,10 @@ def func(parser, options, args): 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.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) diff --git a/stgit/lib/git.py b/stgit/lib/git.py index 9c530c7..6f2c977 100644 --- a/stgit/lib/git.py +++ b/stgit/lib/git.py @@ -933,3 +933,7 @@ def diffstat(diff): """Return the diffstat of the supplied diff.""" return run.Run('git', 'apply', '--stat', '--summary' ).raw_input(diff).raw_output() + +def clone(remote, local): + """Clone a remote repository using 'git clone'.""" + run.Run('git', 'clone', remote, local).run()