#!/usr/bin/python # -*- coding: utf-8 -*- # # (C) 2006 Guido Guenther # 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 from git_buildpackage import * from git_buildpackage.git_utils import * from git_buildpackage.config import GBPOptionParser def cleanupTmpTree(tree): RemoveTree(tree)() def unpackOrig(tgz): """unpack a .orig.tar.gz""" try: unpackTGZ = UnpackTGZ(tgz, tempfile.mkdtemp(dir='../')) unpackTGZ() except CommandExecFailed: print "Unpacking of %s failed" % (tgz,) cleanupTmpTree(unpackTGZ.dir) return return unpackTGZ.dir def get_version(tgz): """get the version from the filename of a .orig.tar.gz""" origre = re.compile('^[a-z\d-]+_(?P[a-z\d\.\~\-]+)\.orig\.tar\.gz') m = origre.match(os.path.basename(tgz)) if m: return m.group('version') def main(argv): parser = GBPOptionParser(command=os.path.basename(argv[0]), prefix='', usage='%prog [-u version] /path/to/upstream-version.tar.gz') parser.add_option("-u", "--upstreamversion", 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', 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", 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") (options, args) = parser.parse_args(argv[1:]) gitCheckoutUpstream = GitCheckoutBranch(options.upstream) gitCheckoutMaster = GitCheckoutBranch(options.debian) gitShowBranch = GitShowBranch() gitPullUpstream = GitPull('.', options.upstream) if options.verbose: Command.verbose = True if len(args) != 1: parser.print_help() return 1 else: tgz = args[0] if not is_repository('.'): print >>sys.stderr,"%s is not a git repository" % (os.path.abspath('.'),) return 1 if options.version: version = options.version else: version = get_version(tgz) if version: print "Upstream version is %s" % (version,) else: print >>sys.stderr,"Cannot determine upstream version from %s - use -u" % (tgz,) parser.print_help() return 1 (ret, out) = is_repository_clean('.') if not ret: print >>sys.stderr, "Repository has uncommitted changes, commit them first: " print >>sys.stderr, out return 1 tmpdir = unpackOrig(tgz) if not tmpdir: return 1 else: print "Unpacked orig to %s" % (tmpdir, ) origdir=glob.glob(tmpdir+'/*')[0] try: print "Importing %s to upstream branch..." % (tgz,) gitCheckoutUpstream() gitShowBranch() GitLoadDirs()(origdir) GitTag(options.sign_tags, options.keyid)(sanitize_version(version)) if options.merge: print "Merging to %s" % (options.debian,) gitCheckoutMaster() gitShowBranch() gitPullUpstream() Dch("%s-1" % (version,), 'New Upstream Version')() except CommandExecFailed: print >>sys.stderr, "Import of %s failed" % (tgz,) cleanupTmpTree(tmpdir) return 1 cleanupTmpTree(tmpdir) print "Merged version %s of %s into ." % (version, tgz) return 0 if __name__ == "__main__": sys.exit(main(sys.argv)) # vim:et:ts=4:sw=4: