chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The user does not want to mess with the refspecs.
[stgit]
/
stgit
/
commands
/
pull.py
diff --git
a/stgit/commands/pull.py
b/stgit/commands/pull.py
index 69b8d88f114bc33272a5e71a69d4ec5c9e37329a..f837fd4dcf96a4f3c18bf4e93a728a7a98cfb61f 100644
(file)
--- a/
stgit/commands/pull.py
+++ b/
stgit/commands/pull.py
@@
-24,35
+24,35
@@
from stgit import stack, git
help = 'pull the changes from the remote repository'
help = 'pull the changes from the remote repository'
-usage = """%prog [options] [<repository>]
[<refspec>]
+usage = """%prog [options] [<repository>]
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.
-Check the 'git pull' documentation for the <repository> and <refspec>
-format."""
+Check the 'git pull' documentation for the <repository> 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):
"""Pull the changes from a remote repository
"""
action = 'store_true')]
def func(parser, options, args):
"""Pull the changes from a remote repository
"""
- if len(args) >
2
:
+ if len(args) >
1
:
parser.error('incorrect number of arguments')
parser.error('incorrect number of arguments')
- repository = 'origin'
- refspec = None
if len(args) >= 1:
repository = args[0]
if len(args) >= 1:
repository = args[0]
-
if len(args) == 2
:
- re
fspec = args[1]
+
else
:
+ re
pository = crt_series.get_parent_remote()
if crt_series.get_protected():
raise CmdException, 'This branch is protected. Pulls are not permitted'
if crt_series.get_protected():
raise CmdException, 'This branch is protected. Pulls are not permitted'
@@
-64,26
+64,22
@@
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'
# pull the remote changes
print 'Pulling from "%s"...' % repository
sys.stdout.flush()
crt_series.pop_patch(applied[0])
print 'done'
# pull the remote changes
print 'Pulling from "%s"...' % repository
- git.pull(repository
, refspec
)
+ git.pull(repository)
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()