git-import-dsc: import of debian native packages

1 files changed, 8 insertions, 81 deletions

diff --git a/git-import-orig b/git-import-orig
index 273a2de3..44319c5e 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -19,90 +19,12 @@
 
 import sys
 import os
-import subprocess
 import tempfile
 import re
 import glob
 from optparse import OptionParser
+from git_buildpackage import *
 
-class CommandExecFailed:
-    pass
-
-class Command(object):
-    def __init__(self, cmd, args=[]):
-        self.cmd=cmd
-        self.args=args
-
-    def run(self):
-        try:
-            retcode = subprocess.call([self.cmd]+self.args)
-            if retcode < 0:
-                print >>sys.stderr, "%s was terminated by signal %d" % (self.cmd,  -retcode)
-            elif retcode > 0:
-                print >>sys.stderr, "%s returned %d" % (self.cmd,  retcode)
-        except OSError, e:
-            print >>sys.stderr, "Execution failed:", e
-            retcode=1
-        return retcode
-
-    def __call__(self):
-        if self.run():
-            raise CommandExecFailed
-
-
-class UnpackTGZ(Command):
-    def __init__(self, tgz, dir):
-        self.tgz=tgz
-        self.dir=dir
-        Command.__init__(self, 'tar', [ '-C', dir, '-zxf', tgz ])
-        self.run_error="Couldn't unpack", self.tgz
-
-class RemoveTree(Command):
-    "Remove a whole directory tree"
-    def __init__(self, tree):
-        self.tree=tree
-        Command.__init__(self, 'rm', [ '-rf', tree ])
-        self.run_error="Couldn't remove ", self.tree
-
-class Dch(Command):
-    def __init__(self, version, msg):
-        args=['-v', version]
-        if msg:
-            args.append(msg)
-        Command.__init__(self, 'dch', args)
-        self.run_error="Dch failed."
-
-class GitLoadDirs(Command):
-    def __init__(self, upstream_dir):
-        self.upstream_dir=upstream_dir
-        Command.__init__(self, 'git_load_dirs', [ self.upstream_dir ])
-        self.run_error="Couldn't import %s", self.upstream_dir
-
-class GitCommand(Command):
-    "Mother/Father of all git commands"
-    def __init__(self, cmd, args=[]):
-        Command.__init__(self, 'git-'+cmd, args)
-
-class GitShowBranch(GitCommand):
-    def __init__(self):
-        GitCommand.__init__(self,'branch')
-        self.run_error="Couldn't list branches"
-
-class GitCheckoutBranch(GitCommand):
-    def __init__(self, branch):
-        GitCommand.__init__(self,'checkout', [branch])
-        self.branch=branch
-        self.run_error="Couldn't switch to %s branch" % self.branch
-
-class GitPull(GitCommand):
-    def __init__(self, repo, branch):
-        GitCommand.__init__(self,'pull', [repo, branch]) 
-        self.run_error="Couldn't pull %s to %s" % (branch, repo)
-
-class GitTag(GitCommand):
-    def __init__(self, version):
-        GitCommand.__init__(self,'tag', [version]) 
-        self.run_error="Couldn't tag %s" % (version,)
 
 # Used GIT Commands
 gitCheckoutUpstream=GitCheckoutBranch('upstream')
@@ -136,8 +58,13 @@ def main():
 
     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")
     (options, args) = parser.parse_args()
 
+    if options.verbose:
+        Command.verbose = True
+
     if len(args) != 1:
         parser.print_help()
         return 1
@@ -172,8 +99,8 @@ def main():
         print "Importing %s to upstream branch..." % (tgz,)
         gitCheckoutUpstream()
         gitShowBranch()
-        GitLoadDirs(origdir)()
-        GitTag(version)()
+        GitLoadDirs()(origdir)
+        GitTag()(version)
 
         print "Merging to master..."
         gitCheckoutMaster()