1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
#!/usr/bin/python -u
# vim: set fileencoding=utf-8 :
#
# (C) 2009 Guido Guenther <agx@sigxcpu.org>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# heavily inspired by dom-safe-pull which is © 2009 Stéphane Glondu <steph@glondu.net>
#
"""fast forward debian, upstream and pristine-tar branch"""
import sys
import os, os.path
from gbp.command_wrappers import (GitFetch, GitMerge, Command,
CommandExecFailed, PristineTar)
from gbp.config import (GbpOptionParser, GbpOptionGroup)
from gbp.errors import GbpError
from gbp.git import (GitRepositoryError, GitRepository)
def fast_forward_branch(branch, repo, options):
"""
update branch to its remote branch, fail on non fast forward updates
unless --force is given
@return: branch updated or already up to date
@rtype: boolean
"""
update = False
remote = repo.get_merge_branch(branch)
if not remote:
print >>sys.stderr, "Warning: no branch tracking '%s' found - skipping." % branch
return False
can_fast_forward, up_to_date = repo.is_fast_forward(branch, remote)
if up_to_date: # Great, we're done
print "Branch '%s' is already up to date." % branch
return True
if can_fast_forward:
update = True
else:
if options.force:
print "Non-fast forwarding '%s' due to --force" % branch
update = True
else:
print >>sys.stderr, "Warning: Skipping non-fast forward of '%s' - use --force" % branch
if update:
repo.set_branch(branch)
GitMerge(remote)()
return update
def main(argv):
changelog = 'debian/changelog'
retval = 0
parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
usage='%prog [options] - safely update a repository from remote')
branch_group = GbpOptionGroup(parser, "branch options", "branch layout options")
parser.add_option_group(branch_group)
branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch")
branch_group.add_config_file_option(option_name="debian-branch", dest="debian_branch")
branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
parser.add_option("--force", action="store_true", dest="force", default=False,
help="force update even if not fast forward")
parser.add_option("--redo-pq", action="store_true", dest="redo_pq", default=False,
help="Redo the patch queue branch after a pull. Warning: this drops the old patch-queue branch")
parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
help="verbose command execution")
(options, args) = parser.parse_args(argv)
if options.verbose:
Command.verbose = True
try:
repo = GitRepository(os.path.curdir)
except GitRepositoryError:
print >>sys.stderr, "%s is not a git repository" % (os.path.abspath('.'))
return 1
try:
branches = []
current = repo.get_branch()
for branch in [ options.debian_branch, options.upstream_branch ]:
if repo.has_branch(branch):
branches += [ branch ]
if repo.has_branch(PristineTar.branch) and options.pristine_tar:
branches += [ PristineTar.branch ]
(ret, out) = repo.is_clean()
if not ret:
print >>sys.stderr, "You have uncommitted changes in your source tree:"
print >>sys.stderr, out
raise GbpError
GitFetch()()
for branch in branches:
if not fast_forward_branch(branch, repo, options):
retval = 2
if options.redo_pq:
repo.set_branch(options.debian_branch)
Command("gbp-pq")(["drop"])
Command("gbp-pq")(["import"])
repo.set_branch(current)
except CommandExecFailed:
retval = 1
except GbpError, err:
if len(err.__str__()):
print >>sys.stderr, err
retval = 1
return retval
if __name__ == '__main__':
sys.exit(main(sys.argv))
# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
|
