Set stg's text editor in .stgitrc

[stgit] / stgit / main.py

diff --git a/stgit/main.py b/stgit/main.py
index 071c33a..e62e95b 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -32,13 +32,21 @@ import stgit.commands.add
 import stgit.commands.applied
 import stgit.commands.delete
 import stgit.commands.diff
+import stgit.commands.clean
+import stgit.commands.clone
 import stgit.commands.export
 import stgit.commands.files
+import stgit.commands.fold
+import stgit.commands.id
+import stgit.commands.imprt
 import stgit.commands.init
+import stgit.commands.mail
 import stgit.commands.new
 import stgit.commands.pop
+import stgit.commands.pull
 import stgit.commands.push
 import stgit.commands.refresh
+import stgit.commands.rename
 import stgit.commands.resolved
 import stgit.commands.rm
 import stgit.commands.series
@@ -55,13 +63,21 @@ commands = {
     'applied':  stgit.commands.applied,
     'delete':   stgit.commands.delete,
     'diff':     stgit.commands.diff,
+    'clean':    stgit.commands.clean,
+    'clone':    stgit.commands.clone,
     'export':   stgit.commands.export,
     'files':    stgit.commands.files,
+    'fold':     stgit.commands.fold,
+    'id':       stgit.commands.id,
+    'import':   stgit.commands.imprt,
     'init':     stgit.commands.init,
+    'mail':     stgit.commands.mail,
     'new':      stgit.commands.new,
     'pop':      stgit.commands.pop,
+    'pull':     stgit.commands.pull,
     'push':     stgit.commands.push,
     'refresh':  stgit.commands.refresh,
+    'rename':   stgit.commands.rename,
     'resolved': stgit.commands.resolved,
     'rm':       stgit.commands.rm,
     'series':   stgit.commands.series,
@@ -101,7 +117,7 @@ def main():
         print_help()
         sys.exit(0)
     if cmd in ['-v', '--version']:
-        print '%s %s' % (prog, version)
+        print 'Stacked GIT %s' % version
         sys.exit(0)
     if not cmd in commands:
         print >> sys.stderr, 'Unknown command: %s' % cmd
@@ -118,9 +134,13 @@ def main():
                           option_list = command.options)
     options, args = parser.parse_args()
     try:
-        # the lines below are a simple way to avoid an exception when
+        # 'clone' doesn't expect an already initialised GIT tree
+        if cmd == 'clone':
+            stgit.commands.common.crt_series = stack.Series('master')
+        else:
+            stgit.commands.common.crt_series = stack.Series()
+        # the line below is a simple way to avoid an exception when
         # stgit is run outside an initialised tree
-        stgit.commands.common.crt_series = stack.Series()
         setattr(command, 'crt_series', stgit.commands.common.crt_series)
 
         command.func(parser, options, args)