~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
/
pull.py
diff --git
a/stgit/commands/pull.py
b/stgit/commands/pull.py
index
25832a5
..
0608fb6
100644
(file)
--- a/
stgit/commands/pull.py
+++ b/
stgit/commands/pull.py
@@
-39,6
+39,9
@@
format."""
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after pulling',
options = [make_option('-n', '--nopush',
help = 'do not push the patches back after pulling',
+ action = 'store_true'),
+ make_option('-m', '--merged',
+ help = 'check for patches merged upstream',
action = 'store_true')]
def func(parser, options, args):
action = 'store_true')]
def func(parser, options, args):
@@
-47,10
+50,12
@@
def func(parser, options, args):
if len(args) > 2:
parser.error('incorrect number of arguments')
if len(args) > 2:
parser.error('incorrect number of arguments')
- repository = 'origin'
- refspec = None
if len(args) >= 1:
repository = args[0]
if len(args) >= 1:
repository = args[0]
+ else:
+ repository = crt_series.get_parent_remote()
+
+ refspec = None
if len(args) == 2:
refspec = args[1]
if len(args) == 2:
refspec = args[1]
@@
-64,7
+69,7
@@
def func(parser, options, args):
# pop all patches
applied = crt_series.get_applied()
if len(applied) > 0:
# pop all patches
applied = crt_series.get_applied()
if len(applied) > 0:
- print 'Popping all patches...',
+ print 'Popping all
applied
patches...',
sys.stdout.flush()
crt_series.pop_patch(applied[0])
print 'done'
sys.stdout.flush()
crt_series.pop_patch(applied[0])
print 'done'
@@
-75,15
+80,11
@@
def func(parser, options, args):
print 'done'
# push the patches back
print 'done'
# push the patches back
- if options.nopush:
- applied = []
- for p in applied:
- print 'Pushing patch "%s"...' % p,
- sys.stdout.flush()
- crt_series.push_patch(p)
- if crt_series.empty_patch(p):
- print 'done (empty patch)'
- else:
- print 'done'
+ if not options.nopush:
+ push_patches(applied, options.merged)
+
+ # maybe tidy up
+ if config.get('stgit.keepoptimized') == 'yes':
+ git.repack()
print_crt_patch()
print_crt_patch()