import_orig: Move upstream-vcs-tag's help to config

This way it can be shared.

diff --git a/gbp/config.py b/gbp/config.py
index d9a3cfaa5c7871dc6b6e8a488e72645e319d27dc..cef355a8fc24e89c4c547dfb36600cfe295f6078 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -375,7 +375,10 @@ class GbpOptionParser(OptionParser):
         'repo-email':
             "Set repo email from the DEBFULLNAME and DEBEMAIL "
             "environment variables ('DEBIAN') or fallback to the "
-            "git configuration ('GIT'), default is '%(repo-email)s'"
+            "git configuration ('GIT'), default is '%(repo-email)s'",
+        'upstream-vcs-tag':
+            "Upstream VCS tag added to the merge commit, "
+            "default is '%(upstream-vcs-tag)s'",
     }
 
     short_opts = {

diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index 01b1fc6d3bdc2eb7645de7f0c1b830c7e5d89fc4..14a87cbafd08888977dc99f53db97f1c7ec87569 100644 (file)
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -337,8 +337,7 @@ def build_parser(name):
                                         dest="debian_branch")
     branch_group.add_config_file_option(option_name="upstream-branch",
                                         dest="upstream_branch")
-    branch_group.add_config_file_option(option_name="upstream-vcs-tag", dest="vcs_tag",
-                                        help="Upstream VCS tag add to the merge commit")
+    branch_group.add_config_file_option(option_name="upstream-vcs-tag", dest="vcs_tag")
     branch_group.add_boolean_config_file_option(option_name="merge", dest="merge")
     branch_group.add_config_file_option(option_name="merge-mode", dest="merge_mode")