Move debian specific functions from GitRepository to DebianGitRepository

4 files changed, 18 insertions, 18 deletions

diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index cdea328b..922b89eb 100644
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -26,11 +26,11 @@ import time
 import tempfile
 import shutil
 import gbp.deb as du
-from gbp.git import (GitRepositoryError, GitRepository, build_tag)
 from gbp.command_wrappers import (Command,
                                   RunAtCommand, CommandExecFailed, PristineTar,
                                   RemoveTree, CatenateTarArchive)
 from gbp.config import (GbpOptionParser, GbpOptionGroup)
+from gbp.deb.git import (GitRepositoryError, DebianGitRepository)
 from gbp.deb.changelog import ChangeLog, NoChangeLogError, ParseChangeLogError
 from gbp.errors import GbpError
 from glob import glob
@@ -333,7 +333,7 @@ def pristine_tar_build_orig(repo, cp, output_dir, options):
 def git_archive_build_orig(repo, cp, output_dir, options):
     """build orig using git-archive"""
     if options.upstream_tree == 'tag':
-        upstream_tree = build_tag(options.upstream_tag, cp['Upstream-Version'])
+        upstream_tree = repo.version_to_tag(options.upstream_tag, cp['Upstream-Version'])
     elif options.upstream_tree == 'branch':
         upstream_tree = options.upstream_branch
     else:
@@ -512,7 +512,7 @@ def main(argv):
         return 1
 
     try:
-        repo = GitRepository(os.path.curdir)
+        repo = DebianGitRepository(os.path.curdir)
     except GitRepositoryError:
         gbp.log.err("%s is not a git repository" % (os.path.abspath('.')))
         return 1
@@ -601,7 +601,7 @@ def main(argv):
                                    'GBP_BUILD_DIR': build_dir})()
         if options.tag or options.tag_only:
             gbp.log.info("Tagging %s" % cp.version)
-            tag = build_tag(options.debian_tag, cp.version)
+            tag = repo.version_to_tag(options.debian_tag, cp.version)
             if options.retag and repo.has_tag(tag):
                 repo.delete_tag(tag)
             repo.create_tag(name=tag, msg="Debian release %s" % cp.version,
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index b502e216..1a4a6c08 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -26,10 +26,10 @@ import subprocess
 import gbp.command_wrappers as gbpc
 import gbp.dch as dch
 import gbp.log
-from gbp.git import (GitRepositoryError, GitRepository, build_tag, tag_to_version)
 from gbp.config import GbpOptionParser, GbpOptionGroup
 from gbp.errors import GbpError
 from gbp.deb import compare_versions
+from gbp.deb.git import GitRepositoryError, DebianGitRepository
 from gbp.deb.changelog import ChangeLog, NoChangeLogError
 
 user_customizations = {}
@@ -110,7 +110,7 @@ def add_changelog_section(msg, distribution, repo, options, cp,
         pattern = options.upstream_tag.replace('%(version)s', '*')
         try:
             tag = repo.find_tag('HEAD', pattern=pattern)
-            upstream = tag_to_version(tag, options.upstream_tag)
+            upstream = repo.tag_to_version(tag, options.upstream_tag)
             if upstream:
                 gbp.log.debug("Found %s." % upstream)
                 new_version = "%s-1" % upstream
@@ -379,7 +379,7 @@ def main(argv):
 
     try:
         try:
-            repo = GitRepository('.')
+            repo = DebianGitRepository('.')
         except GitRepositoryError:
             raise GbpError, "%s is not a git repository" % (os.path.abspath('.'))
 
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 10721c12..4d512e3f 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -28,9 +28,9 @@ from email.Utils import parseaddr
 import gbp.command_wrappers as gbpc
 from gbp.deb import (debian_version_chars,
                      parse_dsc, DscFile, UpstreamSource)
+from gbp.deb.git import (DebianGitRepository, GitRepositoryError)
 from gbp.deb.changelog import ChangeLog
-from gbp.git import (build_tag, GitRepository,
-                     GitRepositoryError, rfc822_date_to_git)
+from gbp.git import rfc822_date_to_git
 from gbp.config import GbpOptionParser, GbpOptionGroup, no_upstream_branch_msg
 from gbp.errors import GbpError
 import gbp.log
@@ -109,7 +109,7 @@ def apply_debian_patch(repo, unpack_dir, src, options, parents):
                                  committer=dict(name=[None, author][options.author_committer],
                                                 email=[None, email][options.author_committer],
                                                 date=[None, date][options.author_committer_date]))
-        repo.create_tag(build_tag(options.debian_tag, src.version),
+        repo.create_tag(repo.version_to_tag(options.debian_tag, src.version),
                         msg="Debian release %s" % src.version,
                         commit=commit,
                         sign=options.sign_tags,
@@ -140,9 +140,9 @@ def print_dsc(dsc):
 
 def move_tag_stamp(repo, format, version):
     "Move tag out of the way appending the current timestamp"
-    old = build_tag(format, version)
+    old = repo.version_to_tag(format, version)
     timestamped = "%s~%s" % (version, int(time.time()))
-    new = build_tag(format, timestamped)
+    new = repo.version_to_tag(format, timestamped)
     repo.move_tag(old, new)
 
 
@@ -237,7 +237,7 @@ def main(argv):
                 print_dsc(src)
 
             try:
-                repo = GitRepository('.')
+                repo = DebianGitRepository('.')
                 is_empty = repo.is_empty()
 
                 (clean, out) = repo.is_clean()
@@ -252,7 +252,7 @@ def main(argv):
 
             if needs_repo:
                 gbp.log.info("No git repository found, creating one.")
-                repo = GitRepository.create(src.pkg)
+                repo = DebianGitRepository.create(src.pkg)
                 os.chdir(repo.path)
 
             if repo.bare:
@@ -263,7 +263,7 @@ def main(argv):
             upstream.unpack(dirs['tmp'], options.filters)
 
             format = [(options.upstream_tag, "Upstream"), (options.debian_tag, "Debian")][src.native]
-            tag = build_tag(format[0], src.upstream_version)
+            tag = repo.version_to_tag(format[0], src.upstream_version)
             msg = "%s version %s" % (format[1], src.upstream_version)
 
             if repo.find_version(options.debian_tag, src.version):
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index f6c8aa5e..55b2c2e6 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -31,7 +31,7 @@ from gbp.deb import (UpstreamSource,
                      packagename_msg, is_valid_upstreamversion,
                      upstreamversion_msg)
 from gbp.deb.changelog import ChangeLog, NoChangeLogError
-from gbp.git import (GitRepositoryError, GitRepository, build_tag)
+from gbp.deb.git import (GitRepositoryError, DebianGitRepository)
 from gbp.config import GbpOptionParser, GbpOptionGroup, no_upstream_branch_msg
 from gbp.errors import (GbpError, GbpNothingImported)
 import gbp.log
@@ -338,7 +338,7 @@ def main(argv):
             return ret
 
         try:
-            repo = GitRepository('.')
+            repo = DebianGitRepository('.')
         except GitRepositoryError:
             raise GbpError, "%s is not a git repository" % (os.path.abspath('.'))
 
@@ -400,7 +400,7 @@ def main(argv):
                 else:
                     gbp.log.warn("'%s' not an archive, skipping pristine-tar" % source.path)
 
-            tag = build_tag(options.upstream_tag, version)
+            tag = repo.version_to_tag(options.upstream_tag, version)
             repo.create_tag(name=tag,
                             msg="Upstream version %s" % version,
                             commit=commit,