mdw@git.distorted.org.uk Git - stgit/blob - stgit/commands/pull.py

   1 __copyright__ = """
   2 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
   3
   4 This program is free software; you can redistribute it and/or modify
   5 it under the terms of the GNU General Public License version 2 as
   6 published by the Free Software Foundation.
   7
   8 This program is distributed in the hope that it will be useful,
   9 but WITHOUT ANY WARRANTY; without even the implied warranty of
  10 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  11 GNU General Public License for more details.
  12
  13 You should have received a copy of the GNU General Public License
  14 along with this program; if not, write to the Free Software
  15 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  16 """
  17
  18 import sys, os
  19 from optparse import OptionParser, make_option
  20
  21 from stgit.commands.common import *
  22 from stgit.utils import *
  23 from stgit import stack, git
  24
  25
  26 help = 'pull the changes from the remote repository'
  27 usage = '%prog [options]'
  28
  29 options = [make_option('-n', '--nopush',
  30                        help = 'do not push the patches back after pulling',
  31                        action = 'store_true'),
  32            make_option('--head', metavar='OTHER_HEAD',
  33                        help = 'pull OTHER_HEAD instead of HEAD'),
  34            make_option('--tag',
  35                        help = 'pull TAG')]
  36
  37
  38 def func(parser, options, args):
  39     """Pull the changes from a remote repository
  40     """
  41     if len(args) != 0:
  42         parser.error('incorrect number of arguments')
  43
  44     check_local_changes()
  45     check_conflicts()
  46     check_head_top_equal()
  47
  48     branch = git.get_head_file()
  49     location = read_string(os.path.join(git.base_dir, 'branches', branch))
  50
  51     print 'Pulling from "%s"...' % location
  52     new_head = git.fetch(location, options.head, options.tag)
  53     print 'done'
  54
  55     if new_head == git_id('base'):
  56         print 'Branch already up-to-date'
  57     else:
  58         applied = crt_series.get_applied()
  59
  60         if len(applied) > 0:
  61             print 'Popping all patches...',
  62             sys.stdout.flush()
  63             crt_series.pop_patch(applied[0])
  64             print 'done'
  65
  66         git.switch(new_head)
  67
  68         if options.nopush:
  69             applied = []
  70         for p in applied:
  71             print 'Pushing patch "%s"...' % p,
  72             sys.stdout.flush()
  73             crt_series.push_patch(p)
  74             if crt_series.empty_patch(p):
  75                 print 'done (empty patch)'
  76             else:
  77                 print 'done'
  78
  79     print_crt_patch()