diff options
| author | Rob Browning <rlb@defaultvalue.org> | 2010-12-08 10:26:31 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-12-09 19:13:29 +0100 |
| commit | d12a32f732575c52552e9e5c99905d2c15621dd9 (patch) | |
| tree | 681a890753624365ab53bff1ab240c9c5931d008 | |
| parent | 5ace5ebf51be914a67c63d29e56b28390c480a68 (diff) | |
Add --multimaint support to git-dch
| -rw-r--r-- | gbp/config.py | 5 | ||||
| -rwxr-xr-x | git-dch | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gbp/config.py b/gbp/config.py index ff75a19f..b3f4c536 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -73,7 +73,8 @@ class GbpOptionParser(OptionParser): 'compression' : 'auto', 'compression-level': '9', 'remote-url-pattern' : 'ssh://alioth.debian.org/git/collab-maint/%(pkg)s.git', - 'multimaint-merge' : 'False', + 'multimaint' : 'True', + 'multimaint-merge': 'False', 'pbuilder' : 'False', 'dist' : 'sid', 'arch' : '', @@ -116,6 +117,8 @@ class GbpOptionParser(OptionParser): "extract orig tarball when using export-dir option, default is '%(overlay)s'", 'remote-url-pattern': "Remote url pattern to create the repo at, default is '%(remote-url-pattern)s'", + 'multimaint': + "Note multiple maintainers, default is '%(multimaint)s'", 'multimaint-merge': "Merge commits by maintainer, default is '%(multimaint-merge)s'", 'pbuilder': @@ -325,6 +325,7 @@ def main(argv): type="int", metavar="N") commit_group.add_config_file_option(option_name="ignore-regex", dest="ignore_regex", help="Ignore commit lines matching regex, default is '%(ignore-regex)s'") + commit_group.add_boolean_config_file_option(option_name="multimaint", dest="multimaint") commit_group.add_boolean_config_file_option(option_name="multimaint-merge", dest="multimaint_merge") help_msg = 'Load Python code from CUSTOMIZATION_FILE. At the moment,' \ @@ -348,6 +349,11 @@ def main(argv): else: dch_options = "--nomultimaint-merge" + if options.multimaint: + dch_options += " --multimaint" + else: + dch_options += " --nomultimaint" + if options.customization_file: execfile(options.customization_file, user_customizations, |