~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move identification of parent branch's remote def up into stack class.
[stgit]
/
stgit
/
commands
/
push.py
diff --git
a/stgit/commands/push.py
b/stgit/commands/push.py
index
a636ad2
..
b6e24d9
100644
(file)
--- a/
stgit/commands/push.py
+++ b/
stgit/commands/push.py
@@
-57,6
+57,9
@@
options = [make_option('-a', '--all',
def func(parser, options, args):
"""Pushes the given patch or all onto the series
"""
def func(parser, options, args):
"""Pushes the given patch or all onto the series
"""
+ check_conflicts()
+ check_local_changes()
+ check_head_top_equal()
# If --undo is passed, do the work and exit
if options.undo:
# If --undo is passed, do the work and exit
if options.undo:
@@
-66,7
+69,6
@@
def func(parser, options, args):
print 'Undoing the "%s" push...' % patch,
sys.stdout.flush()
print 'Undoing the "%s" push...' % patch,
sys.stdout.flush()
- resolved_all()
if crt_series.undo_push():
print 'done'
else:
if crt_series.undo_push():
print 'done'
else:
@@
-75,10
+77,6
@@
def func(parser, options, args):
return
return
- check_local_changes()
- check_conflicts()
- check_head_top_equal()
-
unapplied = crt_series.get_unapplied()
if not unapplied:
raise CmdException, 'No more patches to push'
unapplied = crt_series.get_unapplied()
if not unapplied:
raise CmdException, 'No more patches to push'