diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 1dd6bb41..c47291dd 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -346,33 +346,31 @@ def build_parser(name, prefix=None): export_group = parser.add_argument_group("export build-tree options", "alternative build tree related options") - parser.add_bool_conf_file_arg("--ignore-new", dest="ignore_new") - parser.add_arg("--verbose", action="store_true", dest="verbose", + parser.add_bool_conf_file_arg("--ignore-new") + parser.add_arg("--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - parser.add_conf_file_arg("--notify", dest="notify", type='tristate') - tag_group.add_arg("--tag", action="store_true", dest="tag", + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + parser.add_conf_file_arg("--notify", type='tristate') + tag_group.add_arg("--tag", action="store_true", help="create a tag after a successful build") - tag_group.add_arg("--tag-only", action="store_true", dest="tag_only", + tag_group.add_arg("--tag-only", action="store_true", help="don't build, only tag and run the posttag hook") - tag_group.add_arg("--retag", action="store_true", dest="retag", + tag_group.add_arg("--retag", action="store_true", help="don't fail if the tag already exists") - tag_group.add_bool_conf_file_arg("--sign-tags", dest="sign_tags") - tag_group.add_conf_file_arg("--keyid", dest="keyid") - tag_group.add_conf_file_arg("--debian-tag", dest="debian_tag") - tag_group.add_conf_file_arg("--debian-tag-msg", dest="debian_tag_msg") - tag_group.add_conf_file_arg("--upstream-tag", dest="upstream_tag") - orig_group.add_conf_file_arg("--upstream-tree", dest="upstream_tree") - orig_group.add_bool_conf_file_arg("--pristine-tar", dest="pristine_tar") - orig_group.add_bool_conf_file_arg("--pristine-tar-commit", - dest="pristine_tar_commit") - orig_group.add_conf_file_arg("--force-create", dest="force_create", + tag_group.add_bool_conf_file_arg("--sign-tags") + tag_group.add_conf_file_arg("--keyid") + tag_group.add_conf_file_arg("--debian-tag") + tag_group.add_conf_file_arg("--debian-tag-msg") + tag_group.add_conf_file_arg("--upstream-tag") + orig_group.add_conf_file_arg("--upstream-tree") + orig_group.add_bool_conf_file_arg("--pristine-tar") + orig_group.add_bool_conf_file_arg("--pristine-tar-commit") + orig_group.add_conf_file_arg("--force-create", help="force creation of orig tarball", action="store_true") - orig_group.add_conf_file_arg("--no-create-orig", dest="no_create_orig", + orig_group.add_conf_file_arg("--no-create-orig", help="don't create orig tarball", action="store_true") - orig_group.add_conf_file_arg("--tarball-dir", dest="tarball_dir", type="path", + orig_group.add_conf_file_arg("--tarball-dir", type="path", help="location to look for external tarballs") orig_group.add_conf_file_arg("--compression", dest="comp_type", help="Compression type") @@ -380,38 +378,37 @@ def build_parser(name, prefix=None): help="Compression level") orig_group.add_conf_file_arg("--component", action="append", metavar='COMPONENT', dest="components") - branch_group.add_conf_file_arg("--upstream-branch", dest="upstream_branch") - branch_group.add_conf_file_arg("--debian-branch", dest="debian_branch") - branch_group.add_bool_conf_file_arg("--ignore-branch", dest="ignore_branch") + branch_group.add_conf_file_arg("--upstream-branch") + branch_group.add_conf_file_arg("--debian-branch") + branch_group.add_bool_conf_file_arg("--ignore-branch") branch_group.add_bool_conf_file_arg("--submodules", dest="with_submodules") - cmd_group.add_conf_file_arg("--builder", dest="builder", + cmd_group.add_conf_file_arg("--builder", help="command to build the Debian package") - cmd_group.add_conf_file_arg("--cleaner", dest="cleaner", + cmd_group.add_conf_file_arg("--cleaner", help="command to clean the working copy") - cmd_group.add_conf_file_arg("--prebuild", dest="prebuild", + cmd_group.add_conf_file_arg("--prebuild", help="hook to run before a build") - cmd_group.add_conf_file_arg("--postexport", dest="postexport", + cmd_group.add_conf_file_arg("--postexport", help="hook to run after exporting the source tree") - cmd_group.add_conf_file_arg("--postbuild", dest="postbuild", + cmd_group.add_conf_file_arg("--postbuild", help="hook run after a successful build") - cmd_group.add_conf_file_arg("--posttag", dest="posttag", + cmd_group.add_conf_file_arg("--posttag", help="hook run after a successful tag operation") cmd_group.add_bool_conf_file_arg("--pbuilder", dest="use_pbuilder") cmd_group.add_bool_conf_file_arg("--qemubuilder", dest="use_qemubuilder") cmd_group.add_conf_file_arg("--dist", dest="pbuilder_dist") cmd_group.add_conf_file_arg("--arch", dest="pbuilder_arch") - cmd_group.add_bool_conf_file_arg("--pbuilder-autoconf", - dest="pbuilder_autoconf") - cmd_group.add_conf_file_arg("--pbuilder-options", dest="pbuilder_options") - cmd_group.add_bool_conf_file_arg("--hooks", dest="hooks") - export_group.add_conf_file_arg("--export-dir", dest="export_dir", type="path", + cmd_group.add_bool_conf_file_arg("--pbuilder-autoconf") + cmd_group.add_conf_file_arg("--pbuilder-options") + cmd_group.add_bool_conf_file_arg("--hooks") + export_group.add_conf_file_arg("--export-dir", type="path", help="before building the package export " "the source into EXPORT_DIR") - export_group.add_conf_file_arg("--export", dest="export", + export_group.add_conf_file_arg("--export", help="export treeish object TREEISH", metavar="TREEISH") - export_group.add_bool_conf_file_arg("--purge", dest="purge") - export_group.add_bool_conf_file_arg("--overlay", dest="overlay") + export_group.add_bool_conf_file_arg("--purge") + export_group.add_bool_conf_file_arg("--overlay") return parser diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index 8a5f22b8..059a428e 100644 --- a/gbp/scripts/buildpackage_rpm.py +++ b/gbp/scripts/buildpackage_rpm.py @@ -304,99 +304,75 @@ def build_parser(name, prefix=None, git_treeish=None): export_group = parser.add_argument_group("export build-tree options", "alternative build tree related options") - parser.add_bool_conf_file_arg("--ignore-new", - dest="ignore_new") - parser.add_arg("--verbose", action="store_true", dest="verbose", + parser.add_bool_conf_file_arg("--ignore-new") + parser.add_arg("--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--tmp-dir", dest="tmp_dir") - parser.add_conf_file_arg("--color", dest="color", + parser.add_conf_file_arg("--tmp-dir") + parser.add_conf_file_arg("--color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - parser.add_conf_file_arg("--notify", dest="notify", + parser.add_conf_file_arg("--color-scheme") + parser.add_conf_file_arg("--notify", type='tristate') - parser.add_conf_file_arg("--vendor", action="store", - dest="vendor") - parser.add_conf_file_arg("--native", dest="native", + parser.add_conf_file_arg("--vendor", action="store") + parser.add_conf_file_arg("--native", type='tristate') - tag_group.add_arg("--tag", action="store_true", dest="tag", + tag_group.add_arg("--tag", action="store_true", help="create a tag after a successful build") - tag_group.add_arg("--tag-only", action="store_true", dest="tag_only", + tag_group.add_arg("--tag-only", action="store_true", help="don't build, only tag and run the posttag hook") - tag_group.add_arg("--retag", action="store_true", dest="retag", + tag_group.add_arg("--retag", action="store_true", help="don't fail if the tag already exists") - tag_group.add_bool_conf_file_arg("--sign-tags", - dest="sign_tags") - tag_group.add_conf_file_arg("--keyid", dest="keyid") - tag_group.add_conf_file_arg("--packaging-tag", - dest="packaging_tag") - tag_group.add_conf_file_arg("--packaging-tag-msg", - dest="packaging_tag_msg") - tag_group.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") - orig_group.add_conf_file_arg("--upstream-tree", - dest="upstream_tree") - orig_group.add_bool_conf_file_arg("--pristine-tar", - dest="pristine_tar") - orig_group.add_bool_conf_file_arg("--pristine-tar-commit", - dest="pristine_tar_commit") - orig_group.add_conf_file_arg("--force-create", - dest="force_create", action="store_true", + tag_group.add_bool_conf_file_arg("--sign-tags") + tag_group.add_conf_file_arg("--keyid") + tag_group.add_conf_file_arg("--packaging-tag") + tag_group.add_conf_file_arg("--packaging-tag-msg") + tag_group.add_conf_file_arg("--upstream-tag") + orig_group.add_conf_file_arg("--upstream-tree") + orig_group.add_bool_conf_file_arg("--pristine-tar") + orig_group.add_bool_conf_file_arg("--pristine-tar-commit") + orig_group.add_conf_file_arg("--force-create", action="store_true", help="force creation of upstream source tarball") - orig_group.add_conf_file_arg("--no-create-orig", - dest="no_create_orig", action="store_true", + orig_group.add_conf_file_arg("--no-create-orig", action="store_true", help="don't create upstream source tarball") - orig_group.add_conf_file_arg("--tarball-dir", - dest="tarball_dir", type="path", + orig_group.add_conf_file_arg("--tarball-dir", type="path", help="location to look for external tarballs") orig_group.add_conf_file_arg("--compression-level", dest="comp_level", help="Compression level") - branch_group.add_conf_file_arg("--upstream-branch", - dest="upstream_branch") - branch_group.add_conf_file_arg("--packaging-branch", - dest="packaging_branch") - branch_group.add_bool_conf_file_arg("--ignore-branch", - dest="ignore_branch") + branch_group.add_conf_file_arg("--upstream-branch") + branch_group.add_conf_file_arg("--packaging-branch") + branch_group.add_bool_conf_file_arg("--ignore-branch") branch_group.add_bool_conf_file_arg("--submodules", dest="with_submodules") - cmd_group.add_conf_file_arg("--builder", dest="builder", + cmd_group.add_conf_file_arg("--builder", help="command to build the package") - cmd_group.add_conf_file_arg("--cleaner", dest="cleaner", + cmd_group.add_conf_file_arg("--cleaner", help="command to clean the working copy") - cmd_group.add_conf_file_arg("--prebuild", dest="prebuild", + cmd_group.add_conf_file_arg("--prebuild", help="command to run before a build") cmd_group.add_conf_file_arg("--postexport", - dest="postexport", help="command to run after exporting the source tree") - cmd_group.add_conf_file_arg("--postbuild", dest="postbuild", + cmd_group.add_conf_file_arg("--postbuild", help="hook run after a successful build") - cmd_group.add_conf_file_arg("--posttag", dest="posttag", + cmd_group.add_conf_file_arg("--posttag", help="hook run after a successful tag operation") cmd_group.add_bool_conf_file_arg("--mock", dest="use_mock") cmd_group.add_conf_file_arg("--dist", dest="mock_dist") cmd_group.add_conf_file_arg("--arch", dest="mock_arch") - cmd_group.add_conf_file_arg("--mock-root", dest="mock_root") - cmd_group.add_conf_file_arg("--mock-options", dest="mock_options") - cmd_group.add_bool_conf_file_arg("--hooks", dest="hooks") + cmd_group.add_conf_file_arg("--mock-root") + cmd_group.add_conf_file_arg("--mock-options") + cmd_group.add_bool_conf_file_arg("--hooks") export_group.add_arg("--no-build", action="store_true", - dest="no_build", help="Don't run builder or the associated hooks") - export_group.add_conf_file_arg("--export-dir", - dest="export_dir", type="path", + export_group.add_conf_file_arg("--export-dir", type="path", help="Build topdir, also export the sources under " "EXPORT_DIR") - export_group.add_conf_file_arg("--export-specdir", - dest="export_specdir", type="path") - export_group.add_conf_file_arg("--export-sourcedir", - dest="export_sourcedir", type="path") - export_group.add_conf_file_arg("--export", dest="export", - metavar="TREEISH", + export_group.add_conf_file_arg("--export-specdir", type="path") + export_group.add_conf_file_arg("--export-sourcedir", type="path") + export_group.add_conf_file_arg("--export", metavar="TREEISH", help="export treeish object TREEISH") - export_group.add_conf_file_arg("--packaging-dir", - dest="packaging_dir") - export_group.add_conf_file_arg("--spec-file", - dest="spec_file") + export_group.add_conf_file_arg("--packaging-dir") + export_group.add_conf_file_arg("--spec-file") return parser diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py index 6153a0a2..aa4c4aaa 100755 --- a/gbp/scripts/clone.py +++ b/gbp/scripts/clone.py @@ -109,27 +109,25 @@ def build_parser(name): branch_group = parser.add_argument_group("branch options", "branch tracking and layout options") cmd_group = parser.add_argument_group("external command options", "how and when to invoke hooks") - branch_group.add_arg("--all", action="store_true", dest="all", + branch_group.add_arg("--all", action="store_true", help="track all branches, not only debian and upstream") - branch_group.add_conf_file_arg("--upstream-branch", dest="upstream_branch") - branch_group.add_conf_file_arg("--debian-branch", dest="debian_branch") - branch_group.add_bool_conf_file_arg("--pristine-tar", dest="pristine_tar") - branch_group.add_arg("--depth", action="store", dest="depth", default=0, + branch_group.add_conf_file_arg("--upstream-branch") + branch_group.add_conf_file_arg("--debian-branch") + branch_group.add_bool_conf_file_arg("--pristine-tar") + branch_group.add_arg("--depth", action="store", default=0, help="git history depth (for creating shallow clones)") - branch_group.add_arg("--reference", action="store", dest="reference", default=None, + branch_group.add_arg("--reference", action="store", default=None, help="git reference repository (use local copies where possible)") - cmd_group.add_conf_file_arg("--postclone", dest="postclone", + cmd_group.add_conf_file_arg("--postclone", help="hook to run after cloning the source tree") - cmd_group.add_bool_conf_file_arg("--hooks", dest="hooks") + cmd_group.add_bool_conf_file_arg("--hooks") - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", dest="color_scheme") - parser.add_conf_file_arg("--repo-user", dest="repo_user", - choices=['DEBIAN', 'GIT']) - parser.add_conf_file_arg("--repo-email", dest="repo_email", - choices=['DEBIAN', 'GIT']) + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + parser.add_conf_file_arg("--repo-user", choices=['DEBIAN', 'GIT']) + parser.add_conf_file_arg("--repo-email", choices=['DEBIAN', 'GIT']) parser.add_argument("repository", metavar="REPOSITORY", help="repository to clone") parser.add_argument("directory", metavar="DIRECTORY", nargs="?", diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py index 40100f15..582bc541 100644 --- a/gbp/scripts/create_remote_repo.py +++ b/gbp/scripts/create_remote_repo.py @@ -232,33 +232,23 @@ def build_parser(name, sections=[]): "branch layout and tracking options") branch_group.add_conf_file_arg("--remote-url-pattern", dest="remote_url") - branch_group.add_conf_file_arg("--upstream-branch", - dest="upstream_branch") - branch_group.add_conf_file_arg("--debian-branch", - dest="debian_branch") - branch_group.add_bool_conf_file_arg("--pristine-tar", - dest="pristine_tar") - branch_group.add_bool_conf_file_arg("--track", - dest='track') - branch_group.add_bool_conf_file_arg("--bare", - dest='bare') + branch_group.add_conf_file_arg("--upstream-branch") + branch_group.add_conf_file_arg("--debian-branch") + branch_group.add_bool_conf_file_arg("--pristine-tar") + branch_group.add_bool_conf_file_arg("--track") + branch_group.add_bool_conf_file_arg("--bare") parser.add_arg("-v", "--verbose", action="store_true", - dest="verbose", help="verbose command execution") parser.add_conf_file_arg("--color", - dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") + parser.add_conf_file_arg("--color-scheme") parser.add_arg("--remote-name", dest="name", default="origin", help="The name of the remote, default is 'origin'") - parser.add_conf_file_arg("--template-dir", - dest="template_dir") - parser.add_conf_file_arg("--remote-config", - dest="remote_config") + parser.add_conf_file_arg("--template-dir") + parser.add_conf_file_arg("--remote-config") parser.add_argument("action", metavar="ACTION", nargs="?", default="create", choices=('create', 'list'), help="action to take") diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py index c20bdb20..cb67b772 100644 --- a/gbp/scripts/dch.py +++ b/gbp/scripts/dch.py @@ -342,65 +342,64 @@ def build_parser(name): custom_group = parser.add_argument_group("customization", "options for customization") - parser.add_bool_conf_file_arg("--ignore-branch", dest="ignore_branch") - naming_group.add_conf_file_arg("--upstream-branch", dest="upstream_branch") - naming_group.add_conf_file_arg("--debian-branch", dest="debian_branch") - naming_group.add_conf_file_arg("--upstream-tag", dest="upstream_tag") - naming_group.add_conf_file_arg("--debian-tag", dest="debian_tag") - naming_group.add_conf_file_arg("--snapshot-number", dest="snapshot_number", + parser.add_bool_conf_file_arg("--ignore-branch") + naming_group.add_conf_file_arg("--upstream-branch") + naming_group.add_conf_file_arg("--debian-branch") + naming_group.add_conf_file_arg("--upstream-tag") + naming_group.add_conf_file_arg("--debian-tag") + naming_group.add_conf_file_arg("--snapshot-number", help="expression to determine the next snapshot number") - parser.add_conf_file_arg("--git-log", dest="git_log", + parser.add_conf_file_arg("--git-log", help="options to pass to git-log") - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", dest="color_scheme") - range_group.add_arg("-s", "--since", dest="since", help="commit to start from (e.g. HEAD^^^, debian/0.4.3)") - range_group.add_arg("-a", "--auto", action="store_true", dest="auto", + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + range_group.add_arg("-s", "--since", help="commit to start from (e.g. HEAD^^^, debian/0.4.3)") + range_group.add_arg("-a", "--auto", action="store_true", help="autocomplete changelog from last snapshot or tag") - version_group.add_arg("-R", "--release", action="store_true", dest="release", + version_group.add_arg("-R", "--release", action="store_true", help="mark as release") - version_group.add_arg("-S", "--snapshot", action="store_true", dest="snapshot", + version_group.add_arg("-S", "--snapshot", action="store_true", help="mark as snapshot build") - version_group.add_arg("-D", "--distribution", dest="distribution", help="Set distribution") - version_group.add_arg("--force-distribution", action="store_true", dest="force_distribution", + version_group.add_arg("-D", "--distribution", help="Set distribution") + version_group.add_arg("--force-distribution", action="store_true", help="Force the provided distribution to be used, " "even if it doesn't match the list of known distributions") - version_group.add_arg("-N", "--new-version", dest="new_version", + version_group.add_arg("-N", "--new-version", help="use this as base for the new version number") - version_group.add_conf_file_arg("--urgency", dest="urgency") - version_group.add_arg("--bpo", dest="bpo", action="store_true", + version_group.add_conf_file_arg("--urgency") + version_group.add_arg("--bpo", action="store_true", help="Increment the Debian release number for an upload to backports, " "and add a backport upload changelog comment.") - version_group.add_arg("--nmu", dest="nmu", action="store_true", + version_group.add_arg("--nmu", action="store_true", help="Increment the Debian release number for a non-maintainer upload") - version_group.add_arg("--qa", dest="qa", action="store_true", + version_group.add_arg("--qa", action="store_true", help="Increment the Debian release number for a Debian QA Team upload, " "and add a QA upload changelog comment.") - version_group.add_arg("--team", dest="team", action="store_true", + version_group.add_arg("--team", action="store_true", help="Increment the Debian release number for a Debian Team upload, " "and add a Team upload changelog comment.") - version_group.add_arg("--security", dest="security", action="store_true", + version_group.add_arg("--security", action="store_true", help="Increment the Debian release number for a security upload and " "add a security upload changelog comment.") version_group.add_bool_conf_file_arg("--git-author", dest="use_git_author") - commit_group.add_bool_conf_file_arg("--meta", dest="meta") - commit_group.add_conf_file_arg("--meta-closes", dest="meta_closes") - commit_group.add_conf_file_arg("--meta-closes-bugnum", dest="meta_closes_bugnum") - commit_group.add_bool_conf_file_arg("--full", dest="full") + commit_group.add_bool_conf_file_arg("--meta") + commit_group.add_conf_file_arg("--meta-closes") + commit_group.add_conf_file_arg("--meta-closes-bugnum") + commit_group.add_bool_conf_file_arg("--full") commit_group.add_conf_file_arg("--id-length", dest="idlen", help="include N digits of the commit id in the changelog entry", type=int, metavar="N") - commit_group.add_conf_file_arg("--ignore-regex", dest="ignore_regex", + commit_group.add_conf_file_arg("--ignore-regex", help="Ignore commit lines matching regex") - commit_group.add_bool_conf_file_arg("--multimaint", dest="multimaint") - commit_group.add_bool_conf_file_arg("--multimaint-merge", dest="multimaint_merge") - commit_group.add_conf_file_arg("--spawn-editor", dest="spawn_editor") - parser.add_conf_file_arg("--commit-msg", - dest="commit_msg") - parser.add_arg("-c", "--commit", action="store_true", dest="commit", + commit_group.add_bool_conf_file_arg("--multimaint") + commit_group.add_bool_conf_file_arg("--multimaint-merge") + commit_group.add_conf_file_arg("--spawn-editor") + parser.add_conf_file_arg("--commit-msg") + parser.add_arg("-c", "--commit", action="store_true", help="commit changelog file after generating") - parser.add_conf_file_arg("--dch-opt", dest="dch_opts", action="append", + parser.add_conf_file_arg("--dch-opt", action="append", help="option to pass to dch verbatim, " "can be given multiple times", metavar="DCH_OPT") diff --git a/gbp/scripts/export_orig.py b/gbp/scripts/export_orig.py index d2f4a57f..138d84b9 100755 --- a/gbp/scripts/export_orig.py +++ b/gbp/scripts/export_orig.py @@ -275,17 +275,16 @@ def build_parser(name): branch_group = parser.add_argument_group("branch options", "branch layout options") - parser.add_arg("--verbose", action="store_true", dest="verbose", + parser.add_arg("--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - tag_group.add_conf_file_arg("--upstream-tag", dest="upstream_tag") - orig_group.add_conf_file_arg("--upstream-tree", dest="upstream_tree") - orig_group.add_bool_conf_file_arg("--pristine-tar", dest="pristine_tar") - orig_group.add_conf_file_arg("--force-create", dest="force_create", + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + tag_group.add_conf_file_arg("--upstream-tag") + orig_group.add_conf_file_arg("--upstream-tree") + orig_group.add_bool_conf_file_arg("--pristine-tar") + orig_group.add_conf_file_arg("--force-create", help="force creation of orig tarball", action="store_true") - orig_group.add_conf_file_arg("--tarball-dir", dest="tarball_dir", type="path", + orig_group.add_conf_file_arg("--tarball-dir", type="path", help="location to look for external tarballs") orig_group.add_conf_file_arg("--compression", dest="comp_type", help="Compression type") @@ -293,7 +292,7 @@ def build_parser(name): help="Compression level") orig_group.add_conf_file_arg("--component", action="append", metavar='COMPONENT', dest="components") - branch_group.add_conf_file_arg("--upstream-branch", dest="upstream_branch") + branch_group.add_conf_file_arg("--upstream-branch") branch_group.add_bool_conf_file_arg("--submodules", dest="with_submodules") return parser diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py index d550ba58..874453e8 100644 --- a/gbp/scripts/import_dsc.py +++ b/gbp/scripts/import_dsc.py @@ -320,49 +320,35 @@ def build_parser(name): branch_group = parser.add_argument_group("version and branch naming options", "version number and branch layout options") - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - branch_group.add_conf_file_arg("--debian-branch", - dest="debian_branch") - branch_group.add_conf_file_arg("--upstream-branch", - dest="upstream_branch") - branch_group.add_bool_conf_file_arg("--create-missing-branches", - dest="create_missing_branches") - - tag_group.add_bool_conf_file_arg("--sign-tags", - dest="sign_tags") - tag_group.add_conf_file_arg("--keyid", - dest="keyid") - tag_group.add_conf_file_arg("--debian-tag", - dest="debian_tag") - tag_group.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") - tag_group.add_arg("--skip-debian-tag", dest="skip_debian_tag", - action="store_true", + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + branch_group.add_conf_file_arg("--debian-branch") + branch_group.add_conf_file_arg("--upstream-branch") + branch_group.add_bool_conf_file_arg("--create-missing-branches") + + tag_group.add_bool_conf_file_arg("--sign-tags") + tag_group.add_conf_file_arg("--keyid") + tag_group.add_conf_file_arg("--debian-tag") + tag_group.add_conf_file_arg("--upstream-tag") + tag_group.add_arg("--skip-debian-tag", action="store_true", help="Don't add a tag after importing the Debian patch") import_group.add_conf_file_arg("--filter", dest="filters", action="append") - import_group.add_bool_conf_file_arg("--pristine-tar", - dest="pristine_tar") + import_group.add_bool_conf_file_arg("--pristine-tar") import_group.add_arg("--allow-same-version", action="store_true", - dest="allow_same_version", help="allow import of already imported version") import_group.add_bool_conf_file_arg("--author-is-committer", dest="author_committer") import_group.add_bool_conf_file_arg("--author-date-is-committer-date", dest="author_committer_date") - import_group.add_bool_conf_file_arg("--allow-unauthenticated", - dest="allow_unauthenticated") - - parser.add_conf_file_arg("--repo-user", dest="repo_user", - choices=['DEBIAN', 'GIT']) - parser.add_conf_file_arg("--repo-email", dest="repo_email", - choices=['DEBIAN', 'GIT']) - parser.add_arg("--download", dest='download', action="store_true", + import_group.add_bool_conf_file_arg("--allow-unauthenticated") + + parser.add_conf_file_arg("--repo-user", choices=['DEBIAN', 'GIT']) + parser.add_conf_file_arg("--repo-email", choices=['DEBIAN', 'GIT']) + parser.add_arg("--download", action="store_true", help="Ignored. Accepted for compatibility.") parser.add_argument("package", metavar="PACKAGE", help="package to import") diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 846257a2..a679cd68 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -447,47 +447,35 @@ def build_parser(name): branch_group.add_arg("-u", "--upstream-version", dest="version", help="Upstream Version") - branch_group.add_conf_file_arg("--debian-branch", - dest="debian_branch") - branch_group.add_conf_file_arg("--upstream-branch", - dest="upstream_branch") + branch_group.add_conf_file_arg("--debian-branch") + branch_group.add_conf_file_arg("--upstream-branch") branch_group.add_conf_file_arg("--upstream-vcs-tag", dest="vcs_tag", help="Upstream VCS tag add to the merge commit") - branch_group.add_bool_conf_file_arg("--merge", dest="merge") - branch_group.add_conf_file_arg("--merge-mode", dest="merge_mode") - - tag_group.add_bool_conf_file_arg("--sign-tags", - dest="sign_tags") - tag_group.add_conf_file_arg("--keyid", - dest="keyid") - tag_group.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") + branch_group.add_bool_conf_file_arg("--merge") + branch_group.add_conf_file_arg("--merge-mode") + + tag_group.add_bool_conf_file_arg("--sign-tags") + tag_group.add_conf_file_arg("--keyid") + tag_group.add_conf_file_arg("--upstream-tag") import_group.add_conf_file_arg("--filter", dest="filters", action="append") - import_group.add_bool_conf_file_arg("--pristine-tar", - dest="pristine_tar") - import_group.add_bool_conf_file_arg("--filter-pristine-tar", - dest="filter_pristine_tar") - import_group.add_conf_file_arg("--import-msg", - dest="import_msg") - import_group.add_bool_conf_file_arg("--symlink-orig", - dest="symlink_orig") + import_group.add_bool_conf_file_arg("--pristine-tar") + import_group.add_bool_conf_file_arg("--filter-pristine-tar") + import_group.add_conf_file_arg("--import-msg") + import_group.add_bool_conf_file_arg("--symlink-orig") import_group.add_conf_file_arg("--component", action="append", metavar='COMPONENT', dest="components") - cmd_group.add_conf_file_arg("--postimport", dest="postimport") + cmd_group.add_conf_file_arg("--postimport") - parser.add_bool_conf_file_arg("--interactive", - dest='interactive') - parser.add_bool_conf_file_arg("--rollback", - dest="rollback") - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_bool_conf_file_arg("--interactive") + parser.add_bool_conf_file_arg("--rollback") + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") # Accepted for compatibility - parser.add_arg("--download", dest='download', action="store_true", + parser.add_arg("--download", action="store_true", help="Ignored. Accepted for compatibility.") src_group = parser.add_mutually_exclusive_group(required=True) diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py index 9be4dba8..81b46e99 100755 --- a/gbp/scripts/import_srpm.py +++ b/gbp/scripts/import_srpm.py @@ -133,55 +133,39 @@ def build_parser(name): branch_group = parser.add_argument_group("version and branch naming options", "version number and branch layout options") - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", + parser.add_conf_file_arg("--color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - parser.add_conf_file_arg("--tmp-dir", dest="tmp_dir") - parser.add_conf_file_arg("--vendor", action="store", - dest="vendor") - parser.add_arg("--download", action="store_true", dest="download", + parser.add_conf_file_arg("--color-scheme") + parser.add_conf_file_arg("--tmp-dir") + parser.add_conf_file_arg("--vendor", action="store") + parser.add_arg("--download", action="store_true", help="download source package") - branch_group.add_conf_file_arg("--packaging-branch", - dest="packaging_branch") - branch_group.add_conf_file_arg("--upstream-branch", - dest="upstream_branch") - branch_group.add_bool_conf_file_arg("--create-missing-branches", - dest="create_missing_branches") + branch_group.add_conf_file_arg("--packaging-branch") + branch_group.add_conf_file_arg("--upstream-branch") + branch_group.add_bool_conf_file_arg("--create-missing-branches") branch_group.add_arg("--orphan-packaging", action="store_true", - dest="orphan_packaging", help="The packaging branch doesn't base on upstream") - branch_group.add_arg("--native", action="store_true", dest="native", + branch_group.add_arg("--native", action="store_true", help="This is a dist native package, no separate " "upstream branch") - tag_group.add_bool_conf_file_arg("--sign-tags", - dest="sign_tags") - tag_group.add_conf_file_arg("--keyid", - dest="keyid") - tag_group.add_conf_file_arg("--packaging-tag", - dest="packaging_tag") - tag_group.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") + tag_group.add_bool_conf_file_arg("--sign-tags") + tag_group.add_conf_file_arg("--keyid") + tag_group.add_conf_file_arg("--packaging-tag") + tag_group.add_conf_file_arg("--upstream-tag") import_group.add_conf_file_arg("--filter", dest="filters", action="append") - import_group.add_bool_conf_file_arg("--pristine-tar", - dest="pristine_tar") + import_group.add_bool_conf_file_arg("--pristine-tar") import_group.add_arg("--allow-same-version", action="store_true", - dest="allow_same_version", help="allow import of already imported version") - import_group.add_bool_conf_file_arg("--author-is-committer", - dest="author_is_committer") - import_group.add_conf_file_arg("--packaging-dir", - dest="packaging_dir") - - parser.add_conf_file_arg("--repo-user", dest="repo_user", - choices=['DEBIAN', 'GIT']) - parser.add_conf_file_arg("--repo-email", dest="repo_email", - choices=['DEBIAN', 'GIT']) + import_group.add_bool_conf_file_arg("--author-is-committer") + import_group.add_conf_file_arg("--packaging-dir") + + parser.add_conf_file_arg("--repo-user", choices=['DEBIAN', 'GIT']) + parser.add_conf_file_arg("--repo-email", choices=['DEBIAN', 'GIT']) parser.add_argument("package", metavar="PACKAGE", help="package to import") parser.add_argument("target_dir", metavar="TARGET_DIR", nargs="?", help="target directory where to import") diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index 59dad643..4f0d28b7 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -412,16 +412,15 @@ def build_parser(name): return None # Add common arguments - _parent.add_arg("-v", "--verbose", action="store_true", dest="verbose", + _parent.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - _parent.add_conf_file_arg("--color", dest="color", type='tristate') - _parent.add_conf_file_arg("--color-scheme", - dest="color_scheme") - _parent.add_conf_file_arg("--pq-from", dest="pq_from", choices=['DEBIAN', 'TAG']) - _parent.add_conf_file_arg("--upstream-tag", dest="upstream_tag") - _parent.add_arg("--force", dest="force", action="store_true", + _parent.add_conf_file_arg("--color", type='tristate') + _parent.add_conf_file_arg("--color-scheme") + _parent.add_conf_file_arg("--pq-from", choices=['DEBIAN', 'TAG']) + _parent.add_conf_file_arg("--upstream-tag") + _parent.add_arg("--force", action="store_true", help="in case of import even import if the branch already exists") - _parent.add_conf_file_arg("--time-machine", dest="time_machine", type=int) + _parent.add_conf_file_arg("--time-machine", type=int) # Add subcommands subparsers = parser.add_subparsers(title='actions', dest='action') @@ -431,14 +430,14 @@ def build_parser(name): help="export the patch queue associated to the current " "branch into a quilt patch series in debian/patches/ " "and update the series file.") - _parser.add_bool_conf_file_arg("--patch-numbers", dest="patch_numbers") - _parser.add_conf_file_arg("--patch-num-format", dest="patch_num_format") - _parser.add_bool_conf_file_arg("--renumber", dest="renumber") - _parser.add_bool_conf_file_arg("--drop", dest='drop') - _parser.add_bool_conf_file_arg("--commit", dest="commit") - _parser.add_conf_file_arg("--abbrev", dest="abbrev", type=int) - _parser.add_conf_file_arg("--meta-closes", dest="meta_closes") - _parser.add_conf_file_arg("--meta-closes-bugnum", dest="meta_closes_bugnum") + _parser.add_bool_conf_file_arg("--patch-numbers") + _parser.add_conf_file_arg("--patch-num-format") + _parser.add_bool_conf_file_arg("--renumber") + _parser.add_bool_conf_file_arg("--drop") + _parser.add_bool_conf_file_arg("--commit") + _parser.add_conf_file_arg("--abbrev", type=int) + _parser.add_conf_file_arg("--meta-closes") + _parser.add_conf_file_arg("--meta-closes-bugnum") # Import _parser = subparsers.add_parser('import', parents=[_parent], help="create a patch queue branch from" @@ -454,7 +453,7 @@ def build_parser(name): # Apply _parser = subparsers.add_parser('apply', parents=[_parent], help="apply a patch") - _parser.add_arg("--topic", dest="topic", help="in case of 'apply' topic (subdir) to put patch into") + _parser.add_arg("--topic", help="in case of 'apply' topic (subdir) to put patch into") _parser.add_argument("patch", metavar="PATCH", help="Patch to apply") # Switch _parser = subparsers.add_parser('switch', parents=[_parent], diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py index 37ca3c0a..0ce78016 100755 --- a/gbp/scripts/pq_rpm.py +++ b/gbp/scripts/pq_rpm.py @@ -376,18 +376,14 @@ def build_parser(name): return None # Add common arguments - _parent.add_arg("-v", "--verbose", action="store_true", dest="verbose", + _parent.add_arg("-v", "--verbose", action="store_true", help="Verbose command execution") - _parent.add_conf_file_arg("--color", dest="color", - type='tristate') - _parent.add_conf_file_arg("--color-scheme", - dest="color_scheme") - _parent.add_conf_file_arg("--tmp-dir", dest="tmp_dir") - _parent.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") - _parent.add_conf_file_arg("--spec-file", dest="spec_file") - _parent.add_conf_file_arg("--packaging-dir", - dest="packaging_dir") + _parent.add_conf_file_arg("--color", type='tristate') + _parent.add_conf_file_arg("--color-scheme") + _parent.add_conf_file_arg("--tmp-dir") + _parent.add_conf_file_arg("--upstream-tag") + _parent.add_conf_file_arg("--spec-file") + _parent.add_conf_file_arg("--packaging-dir") # Add subcommands subparsers = parser.add_subparsers(title='actions', dest='action') @@ -397,14 +393,13 @@ def build_parser(name): help="Export the patch queue / devel branch associated to the " "current branch into a patch series in and update the spec " "file") - _parser.add_bool_conf_file_arg("--patch-numbers", - dest="patch_numbers") - _parser.add_conf_file_arg("--abbrev", dest="abbrev", type=int) + _parser.add_bool_conf_file_arg("--patch-numbers") + _parser.add_conf_file_arg("--abbrev", type=int) # Import _parser = subparsers.add_parser('import', parents=[_parent], help="Create a patch queue / devel branch from spec file " "and patches in current dir.") - _parser.add_arg("--force", dest="force", action="store_true", + _parser.add_arg("--force", action="store_true", help="In case of import even import if the branch already exists") # Rebase _parser = subparsers.add_parser('rebase', parents=[_parent], diff --git a/gbp/scripts/pristine_tar.py b/gbp/scripts/pristine_tar.py index d313b714..34eaeedd 100644 --- a/gbp/scripts/pristine_tar.py +++ b/gbp/scripts/pristine_tar.py @@ -49,15 +49,13 @@ def build_parser(name): gbp.log.err(err) return None - parser.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") + parser.add_conf_file_arg("--upstream-tag") parser.add_conf_file_arg("--component", action="append", metavar='COMPONENT', dest="components") - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") parser.add_argument("action", metavar="ACTION", choices=('commit',), help="action to take") parser.add_argument("tarball", metavar="TARBALL", diff --git a/gbp/scripts/push.py b/gbp/scripts/push.py index 3d888111..bc1c22d9 100755 --- a/gbp/scripts/push.py +++ b/gbp/scripts/push.py @@ -38,21 +38,15 @@ def build_parser(name): parser.add_arg("-d", "--dry-run", dest="dryrun", action="store_true", help="dry run, don't push.") - parser.add_conf_file_arg("--upstream-branch", - dest="upstream_branch") - parser.add_conf_file_arg("--upstream-tag", - dest="upstream_tag") - parser.add_conf_file_arg("--debian-branch", - dest="debian_branch") - parser.add_conf_file_arg("--debian-tag", - dest="debian_tag") - parser.add_bool_conf_file_arg("--pristine-tar", - dest="pristine_tar") - parser.add_bool_conf_file_arg("--ignore-branch", dest="ignore_branch") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - parser.add_arg("--verbose", action="store_true", dest="verbose", + parser.add_conf_file_arg("--upstream-branch") + parser.add_conf_file_arg("--upstream-tag") + parser.add_conf_file_arg("--debian-branch") + parser.add_conf_file_arg("--debian-tag") + parser.add_bool_conf_file_arg("--pristine-tar") + parser.add_bool_conf_file_arg("--ignore-branch") + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + parser.add_arg("--verbose", action="store_true", help="verbose command execution") parser.add_argument("remote", metavar="REMOTE", nargs="?", help="remote where to push") diff --git a/gbp/scripts/rpm_ch.py b/gbp/scripts/rpm_ch.py index 702bb8d5..6f6435d3 100644 --- a/gbp/scripts/rpm_ch.py +++ b/gbp/scripts/rpm_ch.py @@ -323,19 +323,16 @@ def build_parser(name): "branch names, tag formats, directory and file naming") # Non-grouped options - parser.add_arg("-v", "--verbose", action="store_true", dest="verbose", + parser.add_arg("-v", "--verbose", action="store_true", help="verbose command execution") - parser.add_conf_file_arg("--color", dest="color", + parser.add_conf_file_arg("--color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - parser.add_conf_file_arg("--tmp-dir", dest="tmp_dir") - parser.add_conf_file_arg("--vendor", action="store", - dest="vendor") - parser.add_conf_file_arg("--git-log", dest="git_log", + parser.add_conf_file_arg("--color-scheme") + parser.add_conf_file_arg("--tmp-dir") + parser.add_conf_file_arg("--vendor", action="store") + parser.add_conf_file_arg("--git-log", help="options to pass to git-log") - parser.add_bool_conf_file_arg("--ignore-branch", - dest="ignore_branch") + parser.add_bool_conf_file_arg("--ignore-branch") parser.add_conf_file_arg("--customizations", dest="customization_file", help="Load Python code from CUSTOMIZATION_FILE. At the " @@ -343,38 +340,29 @@ def build_parser(name): "custom ChangelogEntryFormatter class.") # Naming group options - naming_grp.add_conf_file_arg("--packaging-branch", - dest="packaging_branch") - naming_grp.add_conf_file_arg("--packaging-tag", - dest="packaging_tag") - naming_grp.add_conf_file_arg("--packaging-dir", - dest="packaging_dir") - naming_grp.add_conf_file_arg("--changelog-file", - dest="changelog_file") - naming_grp.add_conf_file_arg("--spec-file", dest="spec_file") + naming_grp.add_conf_file_arg("--packaging-branch") + naming_grp.add_conf_file_arg("--packaging-tag") + naming_grp.add_conf_file_arg("--packaging-dir") + naming_grp.add_conf_file_arg("--changelog-file") + naming_grp.add_conf_file_arg("--spec-file") # Range group options - range_grp.add_arg("-s", "--since", dest="since", + range_grp.add_arg("-s", "--since", help="commit to start from (e.g. HEAD^^^, release/0.1.2)") # Formatting group options format_grp.add_arg("--no-release", action="store_false", dest="release", help="no release, just update the last changelog section") - format_grp.add_bool_conf_file_arg("--git-author", - dest="git_author") - format_grp.add_bool_conf_file_arg("--full", dest="full") + format_grp.add_bool_conf_file_arg("--git-author") + format_grp.add_bool_conf_file_arg("--full") format_grp.add_conf_file_arg("--id-length", dest="idlen", help="include N digits of the commit id in " "the changelog entry", type=int, metavar="N") format_grp.add_conf_file_arg("--ignore-regex", - dest="ignore_regex", help="Ignore lines in commit message matching regex,") - format_grp.add_conf_file_arg("--changelog-revision", - dest="changelog_revision") - format_grp.add_conf_file_arg("--spawn-editor", - dest="spawn_editor") - format_grp.add_conf_file_arg("--editor-cmd", - dest="editor_cmd") + format_grp.add_conf_file_arg("--changelog-revision") + format_grp.add_conf_file_arg("--spawn-editor") + format_grp.add_conf_file_arg("--editor-cmd") parser.add_argument("path", metavar="PATH", nargs="*", help="path(s) to look for changes") diff --git a/gbp/scripts/tag.py b/gbp/scripts/tag.py index adf2e81a..eb8a6b1e 100755 --- a/gbp/scripts/tag.py +++ b/gbp/scripts/tag.py @@ -85,23 +85,20 @@ def build_parser(name): gbp.log.err(err) return None - parser.add_arg("--retag", action="store_true", dest="retag", + parser.add_arg("--retag", action="store_true", help="don't fail if the tag already exists") - parser.add_conf_file_arg("--debian-branch", - dest="debian_branch") - parser.add_conf_file_arg("--debian-tag", - dest="debian_tag") - parser.add_conf_file_arg("--debian-tag-msg", dest="debian_tag_msg") - parser.add_bool_conf_file_arg("--sign-tags", dest="sign_tags") - parser.add_conf_file_arg("--keyid", dest="keyid") - parser.add_conf_file_arg("--posttag", dest="posttag", + parser.add_conf_file_arg("--debian-branch") + parser.add_conf_file_arg("--debian-tag") + parser.add_conf_file_arg("--debian-tag-msg") + parser.add_bool_conf_file_arg("--sign-tags") + parser.add_conf_file_arg("--keyid") + parser.add_conf_file_arg("--posttag", help="hook run after a successful tag operation") - parser.add_bool_conf_file_arg("--ignore-branch", dest="ignore_branch") - parser.add_bool_conf_file_arg("--ignore-new", dest="ignore_new") - parser.add_conf_file_arg("--color", dest="color", type='tristate') - parser.add_conf_file_arg("--color-scheme", - dest="color_scheme") - parser.add_arg("--verbose", action="store_true", dest="verbose", + parser.add_bool_conf_file_arg("--ignore-branch") + parser.add_bool_conf_file_arg("--ignore-new") + parser.add_conf_file_arg("--color", type='tristate') + parser.add_conf_file_arg("--color-scheme") + parser.add_arg("--verbose", action="store_true", help="verbose command execution") return parser