from optparse import OptionParser, make_option
from stgit.utils import *
-from stgit import stack, git
+from stgit import stack, git, gitmergeonefile
from stgit.version import version
from stgit.config import config
from stgit.commands.common import *
# The commands
import stgit.commands.add
import stgit.commands.applied
+import stgit.commands.assimilate
+import stgit.commands.branch
import stgit.commands.delete
import stgit.commands.diff
import stgit.commands.clean
+import stgit.commands.clone
+import stgit.commands.commit
import stgit.commands.export
import stgit.commands.files
+import stgit.commands.float
+import stgit.commands.fold
+import stgit.commands.goto
+import stgit.commands.id
import stgit.commands.imprt
import stgit.commands.init
+import stgit.commands.log
import stgit.commands.mail
import stgit.commands.new
+import stgit.commands.patches
+import stgit.commands.pick
import stgit.commands.pop
import stgit.commands.pull
import stgit.commands.push
import stgit.commands.resolved
import stgit.commands.rm
import stgit.commands.series
+import stgit.commands.show
import stgit.commands.status
import stgit.commands.top
import stgit.commands.unapplied
+import stgit.commands.uncommit
#
commands = {
'add': stgit.commands.add,
'applied': stgit.commands.applied,
+ 'assimilate': stgit.commands.assimilate,
+ 'branch': stgit.commands.branch,
'delete': stgit.commands.delete,
'diff': stgit.commands.diff,
'clean': stgit.commands.clean,
+ 'clone': stgit.commands.clone,
+ 'commit': stgit.commands.commit,
'export': stgit.commands.export,
'files': stgit.commands.files,
+ 'float': stgit.commands.float,
+ 'fold': stgit.commands.fold,
+ 'goto': stgit.commands.goto,
+ 'id': stgit.commands.id,
'import': stgit.commands.imprt,
'init': stgit.commands.init,
+ 'log': stgit.commands.log,
'mail': stgit.commands.mail,
'new': stgit.commands.new,
+ 'patches': stgit.commands.patches,
+ 'pick': stgit.commands.pick,
'pop': stgit.commands.pop,
'pull': stgit.commands.pull,
'push': stgit.commands.push,
'resolved': stgit.commands.resolved,
'rm': stgit.commands.rm,
'series': stgit.commands.series,
+ 'show': stgit.commands.show,
'status': stgit.commands.status,
'top': stgit.commands.top,
'unapplied':stgit.commands.unapplied,
+ 'uncommit': stgit.commands.uncommit,
}
+# classification: repository, stack, patch, working copy
+repocommands = (
+ 'branch',
+ 'clone',
+ 'id',
+ 'pull'
+ )
+stackcommands = (
+ 'applied',
+ 'assimilate',
+ 'clean',
+ 'commit',
+ 'float',
+ 'goto',
+ 'init',
+ 'pop',
+ 'push',
+ 'series',
+ 'top',
+ 'unapplied',
+ 'uncommit'
+ )
+patchcommands = (
+ 'delete',
+ 'export',
+ 'files',
+ 'fold',
+ 'import',
+ 'log',
+ 'mail',
+ 'new',
+ 'pick',
+ 'refresh',
+ 'rename',
+ 'show'
+ )
+wccommands = (
+ 'add',
+ 'diff',
+ 'patches',
+ 'resolved',
+ 'rm',
+ 'status'
+ )
+
+def _print_helpstring(cmd):
+ print ' ' + cmd + ' ' * (12 - len(cmd)) + commands[cmd].help
+
def print_help():
print 'usage: %s <command> [options]' % os.path.basename(sys.argv[0])
print
- print 'commands:'
- print ' help print this message'
-
+ print 'Generic commands:'
+ print ' help print the detailed command usage'
+ print ' version display version information'
+ print ' copyright display copyright information'
+ # unclassified commands if any
cmds = commands.keys()
cmds.sort()
for cmd in cmds:
- print ' ' + cmd + ' ' * (12 - len(cmd)) + commands[cmd].help
+ if not cmd in repocommands and not cmd in stackcommands \
+ and not cmd in patchcommands and not cmd in wccommands:
+ _print_helpstring(cmd)
+ print
+
+ print 'Repository commands:'
+ for cmd in repocommands:
+ _print_helpstring(cmd)
+ print
+
+ print 'Stack commands:'
+ for cmd in stackcommands:
+ _print_helpstring(cmd)
+ print
+
+ print 'Patch commands:'
+ for cmd in patchcommands:
+ _print_helpstring(cmd)
+ print
+
+ print 'Working-copy commands:'
+ for cmd in wccommands:
+ _print_helpstring(cmd)
#
# The main function (command dispatcher)
prog = os.path.basename(sys.argv[0])
if len(sys.argv) < 2:
- print >> sys.stderr, 'Unknown command'
+ print >> sys.stderr, 'usage: %s <command>' % prog
print >> sys.stderr, \
- ' Try "%s help" for a list of supported commands' % prog
+ ' Try "%s --help" for a list of supported commands' % prog
sys.exit(1)
cmd = sys.argv[1]
- if cmd in ['-h', '--help', 'help']:
- print_help()
+ if cmd in ['-h', '--help']:
+ if len(sys.argv) >= 3 and sys.argv[2] in commands:
+ cmd = sys.argv[2]
+ sys.argv[2] = '--help'
+ else:
+ print_help()
+ sys.exit(0)
+ if cmd == 'help':
+ if len(sys.argv) == 3 and not sys.argv[2] in ['-h', '--help']:
+ cmd = sys.argv[2]
+ if not cmd in commands:
+ print >> sys.stderr, '%s help: "%s" command unknown' \
+ % (prog, cmd)
+ sys.exit(1)
+
+ sys.argv[0] += ' %s' % cmd
+ command = commands[cmd]
+ parser = OptionParser(usage = command.usage,
+ option_list = command.options)
+ parser.print_help()
+ else:
+ print_help()
+ sys.exit(0)
+ if cmd in ['-v', '--version', 'version']:
+ print 'Stacked GIT %s' % version
+ os.system('git --version')
+ print 'Python version %s' % sys.version
sys.exit(0)
- if cmd in ['-v', '--version']:
- print '%s %s' % (prog, version)
+ if cmd in ['copyright']:
+ print __copyright__
sys.exit(0)
if not cmd in commands:
print >> sys.stderr, 'Unknown command: %s' % cmd
- print >> sys.stderr, ' Try "%s help" for a list of supported commands' \
- % prog
+ print >> sys.stderr, ' Try "%s help" for a list of supported ' \
+ 'commands' % prog
sys.exit(1)
# re-build the command line arguments
del(sys.argv[1])
command = commands[cmd]
- parser = OptionParser(usage = command.usage,
- option_list = command.options)
+ usage = command.usage.split('\n')[0].strip()
+ parser = OptionParser(usage = usage, option_list = command.options)
options, args = parser.parse_args()
try:
- # the lines below are 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)
+ # 'clone' doesn't expect an already initialised GIT tree. A Series
+ # object will be created after the GIT tree is cloned
+ if cmd != 'clone':
+ if hasattr(options, 'branch') and options.branch:
+ command.crt_series = stack.Series(options.branch)
+ else:
+ command.crt_series = stack.Series()
+ stgit.commands.common.crt_series = command.crt_series
command.func(parser, options, args)
- except (IOError, CmdException, stack.StackException, git.GitException), \
- err:
+ except (IOError, CmdException, stack.StackException, git.GitException,
+ gitmergeonefile.GitMergeException), err:
print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
sys.exit(2)
+ except KeyboardInterrupt:
+ sys.exit(1)
sys.exit(0)
~mdw / stgit / blobdiff