aboutsummaryrefslogtreecommitdiff
path: root/git-import-orig
blob: 284bf0dc9a4d345c7aa9735fb608dea928e95573 (plain)
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
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
#!/usr/bin/python
# vim: set fileencoding=utf-8 :
#
# (C) 2006,2007 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
#
"""Import a new upstream version"""

import sys
import os
import tempfile
import re
import glob
import subprocess
import gbp.command_wrappers as gbpc
from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag)
from gbp.config import GbpOptionParser
from gbp.errors import GbpError


def cleanup_tmp_tree(tree):
    """remove a tree of temporary files"""
    try:
        gbpc.RemoveTree(tree)()
    except gbpc.CommandExecFailed:
        print >>sys.stderr, "Removal of tmptree %s failed." % tree


def unpack_orig(archive, tmpdir):
    """unpack a .orig.tar.gz"""
    try:
        unpackArchive = gbpc.UnpackTarArchive(archive, tmpdir)
        unpackArchive()
    except gbpc.CommandExecFailed:
        print "Unpacking of %s failed" % archive
        cleanup_tmp_tree(unpackArchive.dir)
        raise GbpError
    return unpackArchive.dir


def import_source_tree(repo, orig_dir, version, filter, verbose):
    """import source tree to the current branch"""
    try:
        old = set(repo.index_files())
        new = set(gbpc.copy_from(orig_dir, filter))
        gbpc.GitAdd()(['.'])
        files = [ obj for obj in old - new if not os.path.isdir(obj)]
        if files:
            gbpc.GitRm()(files)
        if not repo.is_clean()[0]:
            gbpc.GitCommitAll(verbose=verbose)(msg="Imported upstream version %s" % version)
        else:
            raise GbpError, "Nothing to commit, nothing imported."
    except gbpc.CommandExecFailed:
        raise GbpError, "Import of new upstream version failed."


def guess_version(archive, version_regex=r''):
    """
    guess the version from the filename of an upstgream archive
    @archive: filename to guess to version for
    @version_regex: additional version regex to apply, needs a 'version' group
    """
    version_filters = [ # Debian package_<version>.orig.tar.gz:
                        r'^[a-z\d\-]+_(?P<version>[a-z\d\.\~\-]+)\.orig\.tar\.(gz|bz2)',
                        # Upstream package-<version>.tar.gz:
                        r'^[a-z\d\-]+-(?P<version>[a-z\d\.]+)\.tar\.(gz|bz2)' ]
    if version_regex:
        version_filters = version_regex + version_filters
    for filter in version_filters:
        m = re.match(filter, os.path.basename(archive))
        if m:
            return m.group('version')


def main(argv):
    ret = 0
    tmpdir = ''

    parser = GbpOptionParser(command=os.path.basename(argv[0]), prefix='',
                           usage='%prog [-u version] /path/to/upstream-version.tar.gz')

    parser.add_option("-u", "--upstream-version", dest="version",
                      help="Upstream Version")
    parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
                      help="verbose command execution")
    parser.add_option("--no-merge", dest='merge', action="store_false", default=True,
                      help="after import dont do any merging to another branch")
    parser.add_config_file_option(option_name="debian-branch", dest='debian_branch',
                      help="branch the debian patch is being developed on, default is '%(debian-branch)s'")
    parser.add_config_file_option(option_name="upstream-branch", dest="upstream_branch",
                      help="upstream branch, default is '%(upstream-branch)s'")
    parser.add_config_file_option(option_name="sign-tags", dest="sign_tags",
                      help="sign git tags", action="store_true")
    parser.add_config_file_option(option_name="keyid", dest="keyid",
                      help="GPG keyid to sign tags with")
    parser.add_config_file_option(option_name="upstream-tag", dest="upstream_tag",
                      help="format string for upstream tags, default is '%(upstream-tag)s'")
    parser.add_config_file_option(option_name="filter", dest="filter",
                      help="files to filter out during import")
    (options, args) = parser.parse_args(argv[1:])

    gitCheckoutMaster = gbpc.GitCheckoutBranch(options.debian_branch)
    gitShowBranch = gbpc.GitShowBranch()
    gitPullUpstream = gbpc.GitPull('.', options.upstream_branch)

    try:
        if options.verbose:
            gbpc.Command.verbose = True

        if len(args) != 1:
            parser.print_help()
            raise GbpError
        else:
            archive = args[0]

        try:
            repo = GitRepository('.')
        except GitRepositoryError:
            raise GbpError, "%s is not a git repository" % (os.path.abspath('.'))

        # an empty repo has now branches:
        if repo.get_branch():
            is_empty = False
        else:
            is_empty = True

        if not repo.has_branch(options.upstream_branch) and not is_empty:
            print >>sys.stderr, """
Repository does not have branch '%s' for upstream sources. If there is none see
/usr/share/doc/git-buildpackage/manual-html/gbpc.import.convert.html on howto
create it otherwise use --upstream-branch to specify it.
"""  % options.upstream_branch
            raise GbpError

        if options.version:
            version = options.version
        else:
            version = guess_version(archive)

        if version:
            print "Upstream version is %s" % version
        else:
            print >>sys.stderr, "Cannot determine upstream version from %s - use -u <version>" % archive
            parser.print_help()
            raise GbpError

        (clean, out) = repo.is_clean()
        if not clean and not is_empty:
            print >>sys.stderr, "Repository has uncommitted changes, commit these first: "
            raise GbpError, out

        if os.path.isdir(archive):
            orig_dir = archive
        else:
            tmpdir = tempfile.mkdtemp(dir='../')
            unpack_orig(archive, tmpdir)
            if options.verbose:
                print "Unpacked %s to '%s'" % (archive , tmpdir)
            orig_dir = glob.glob(tmpdir+'/*')[0]

        try:
            if not is_empty:
                print "Importing '%s' to branch '%s'..." % (archive, options.upstream_branch)
                gbpc.GitCheckoutBranch(options.upstream_branch)()
            else:
                print "Initial import of '%s'..." % archive

            import_source_tree(repo, orig_dir, version, options.filter, verbose=not is_empty)
            gbpc.GitTag(options.sign_tags, options.keyid)(build_tag(options.upstream_tag, version),
                        msg="Upstream version %s" % version)

            if is_empty:
                gbpc.GitBranch()(options.upstream_branch)
            elif options.merge:
                print "Merging to %s" % options.debian_branch
                gitCheckoutMaster()
                gitShowBranch()
                try:
                    gitPullUpstream()
                except gbpc.CommandExecFailed:
                    raise GbpError, """Merge failed, please resolve and run "dch -v %s-1".""" % version
                gbpc.Dch("%s-1" % version, 'New Upstream Version')()
        except gbpc.CommandExecFailed:
            raise GbpError, "Import of %s failed" % archive
    except GbpError, err:
        if len(err.__str__()):
            print >>sys.stderr, err
        ret = 1

    if tmpdir:
        cleanup_tmp_tree(tmpdir)

    if not ret:
        print "Succesfully merged version %s of %s into ." % (version, archive)
    return ret

if __name__ == "__main__":
    sys.exit(main(sys.argv))

# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: