GitRepository: Rename remove_tag() to delete_tag()

to be consistent with delete_branch()

diff --git a/gbp/git.py b/gbp/git.py
index e1698a8..83f0505 100644 (file)
--- a/gbp/git.py
+++ b/gbp/git.py
@@ -267,14 +267,19 @@ class GitRepository(object):
         return None
 
 
-    def remove_tag(self, tag):
-        """remove a tag 'tag'"""
+    def delete_tag(self, tag):
+        """
+        Delete a tag named I{tag}
+
+        @param tag: the tag to delete
+        @type tag: string
+        """
         if self.has_tag(tag):
             self._git_command("tag", [ "-d", tag ])
 
     def move_tag(self, old, new):
         self._git_command("tag", [ new, old ])
-        self.remove_tag(old)
+        self.delete_tag(old)
 
     def create_tag(self, name, msg=None, commit=None, sign=False, keyid=None):
         """

diff --git a/git-buildpackage b/git-buildpackage
index 33ea19a..08b3ad4 100755 (executable)
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -538,7 +538,7 @@ def main(argv):
             gbp.log.info("Tagging %s" % version)
             tag = build_tag(options.debian_tag, version)
             if options.retag and repo.has_tag(tag):
-                repo.remove_tag(tag)
+                repo.delete_tag(tag)
             repo.create_tag(name=tag, msg="Debian release %s" % version,
                             sign=options.sign_tags, keyid=options.keyid)
             if options.posttag: