~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a new option to "stg applied" and "stg unapplied" that provides a count
[stgit]
/
stgit
/
commands
/
pull.py
diff --git
a/stgit/commands/pull.py
b/stgit/commands/pull.py
index
f4e0005
..
8f26f4d
100644
(file)
--- a/
stgit/commands/pull.py
+++ b/
stgit/commands/pull.py
@@
-29,7
+29,7
@@
usage = """%prog [options] [<repository>] [<refspec>]
Pull the latest changes from the given repository (defaulting to
'origin'). This command works by popping all the patches from the
stack, pulling the changes in the parent repository, setting the base
Pull the latest changes from the given repository (defaulting to
'origin'). This command works by popping all the patches from the
stack, pulling the changes in the parent repository, setting the base
-of the stack to the latest parent HEAD and pusing the patches back
+of the stack to the latest parent HEAD and pus
h
ing the patches back
(unless '--nopush' is specified). The 'push' operation can fail if
there are conflicts. They need to be resolved and the patch pushed
again.
(unless '--nopush' is specified). The 'push' operation can fail if
there are conflicts. They need to be resolved and the patch pushed
again.
@@
-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):
@@
-54,6
+57,9
@@
def func(parser, options, args):
if len(args) == 2:
refspec = args[1]
if len(args) == 2:
refspec = args[1]
+ if crt_series.get_protected():
+ raise CmdException, 'This branch is protected. Pulls are not permitted'
+
check_local_changes()
check_conflicts()
check_head_top_equal()
check_local_changes()
check_conflicts()
check_head_top_equal()
@@
-61,7
+67,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'
@@
-72,15
+78,7
@@
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)
print_crt_patch()
print_crt_patch()