~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"stg mail" doesn't distinguish between unapplied and non-existent patches
[stgit]
/
stgit
/
main.py
diff --git
a/stgit/main.py
b/stgit/main.py
index
d8d2868
..
07bc7d4
100644
(file)
--- a/
stgit/main.py
+++ b/
stgit/main.py
@@
-30,10
+30,12
@@
from stgit.commands.common import *
# The commands
import stgit.commands.add
import stgit.commands.applied
# 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.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.export
import stgit.commands.files
import stgit.commands.fold
@@
-42,6
+44,7
@@
import stgit.commands.imprt
import stgit.commands.init
import stgit.commands.mail
import stgit.commands.new
import stgit.commands.init
import stgit.commands.mail
import stgit.commands.new
+import stgit.commands.pick
import stgit.commands.pop
import stgit.commands.pull
import stgit.commands.push
import stgit.commands.pop
import stgit.commands.pull
import stgit.commands.push
@@
-61,10
+64,12
@@
import stgit.commands.unapplied
commands = {
'add': stgit.commands.add,
'applied': stgit.commands.applied,
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,
'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,
'export': stgit.commands.export,
'files': stgit.commands.files,
'fold': stgit.commands.fold,
@@
-73,6
+78,7
@@
commands = {
'init': stgit.commands.init,
'mail': stgit.commands.mail,
'new': stgit.commands.new,
'init': stgit.commands.init,
'mail': stgit.commands.mail,
'new': stgit.commands.new,
+ 'pick': stgit.commands.pick,
'pop': stgit.commands.pop,
'pull': stgit.commands.pull,
'push': stgit.commands.push,
'pop': stgit.commands.pop,
'pull': stgit.commands.pull,
'push': stgit.commands.push,
@@
-91,6
+97,9
@@
def print_help():
print
print 'commands:'
print ' help print this message'
print
print 'commands:'
print ' help print this message'
+ print ' version display version information'
+ print ' copyright display copyright information'
+ print
cmds = commands.keys()
cmds.sort()
cmds = commands.keys()
cmds.sort()
@@
-116,13
+125,17
@@
def main():
if cmd in ['-h', '--help', 'help']:
print_help()
sys.exit(0)
if cmd in ['-h', '--help', 'help']:
print_help()
sys.exit(0)
- if cmd in ['-v', '--version']:
- print '%s %s' % (prog, version)
+ if cmd in ['-v', '--version', 'version']:
+ print 'Stacked GIT %s' % version
+ print 'Python version %s' % sys.version
+ sys.exit(0)
+ if cmd in ['copyright']:
+ print __copyright__
sys.exit(0)
if not cmd in commands:
print >> sys.stderr, 'Unknown command: %s' % cmd
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
sys.exit(1)
# re-build the command line arguments
@@
-137,6
+150,8
@@
def main():
# 'clone' doesn't expect an already initialised GIT tree
if cmd == 'clone':
stgit.commands.common.crt_series = stack.Series('master')
# 'clone' doesn't expect an already initialised GIT tree
if cmd == 'clone':
stgit.commands.common.crt_series = stack.Series('master')
+ elif hasattr(options, 'branch') and options.branch:
+ stgit.commands.common.crt_series = stack.Series(options.branch)
else:
stgit.commands.common.crt_series = stack.Series()
# the line below is a simple way to avoid an exception when
else:
stgit.commands.common.crt_series = stack.Series()
# the line below is a simple way to avoid an exception when