# The commands
import stgit.commands.add
import stgit.commands.applied
+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.fold
import stgit.commands.init
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
commands = {
'add': stgit.commands.add,
'applied': stgit.commands.applied,
+ '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,
'fold': stgit.commands.fold,
'init': stgit.commands.init,
'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,
cmd = sys.argv[1]
if cmd in ['-h', '--help', 'help']:
- print_help()
- sys.exit(0)
+ 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 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 ['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
option_list = command.options)
options, args = parser.parse_args()
try:
- # '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
- 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:
print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
sys.exit(2)
+ except KeyboardInterrupt:
+ sys.exit(1)
sys.exit(0)