Merge branch 'proposed' of git://github.com/gustavh/stgit

[stgit] / stgit / commands / init.py

diff --git a/stgit/commands/init.py b/stgit/commands/init.py
index 0326f9abd9da42b9dc91f7d31066f75828fd7b77..6ffb93e2f9f7d029e1910cc0fd21ea88d797b5db 100644 (file)
--- a/stgit/commands/init.py
+++ b/stgit/commands/init.py
@@ -16,26 +16,21 @@ 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 optparse import OptionParser, make_option
-
-from stgit.commands.common import *
-from stgit.utils import *
-from stgit import stack, git
-
-
-help = 'initialise the tree for use with StGIT'
-usage = """%prog [options]
-
-Initialise a GIT repository to be used with StGIT. Note that the
-repository must be already initialised with git-init-db and the
-.git/HEAD link must point to a valid file in refs/heads/. For people
-switching between multiple branches in the same repository, the 'init'
-command has to be run on all the individual branches intended to be
-used with StGIT."""
-
+from stgit.commands import common
+from stgit.lib import stack
+
+help = 'Initialise the current branch for use with StGIT'
+kind = 'stack'
+usage = ['']
+description = """
+Initialise the current git branch to be used as an StGIT stack. The
+branch (and the git repository it is in) must already exist and
+contain at least one commit."""
+
+args = []

 options = []
 
 options = []
 

+directory = common.DirectoryHasRepositoryLib()

 
 def func(parser, options, args):
     """Performs the repository initialisation
 
 def func(parser, options, args):
     """Performs the repository initialisation


@@ -43,4 +38,4 @@ def func(parser, options, args):
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 
     if len(args) != 0:
         parser.error('incorrect number of arguments')
 

-    crt_series.init()
+    stack.Stack.initialise(directory.repository)