diff options
| author | Guido Günther <agx@sigxcpu.org> | 2015-09-05 13:32:34 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-09-05 13:40:23 +0200 |
| commit | 26c726e14516d4f4619ed4357dcedd55f3c72eb3 (patch) | |
| tree | ab3505b8a4ef56ed25a389052bc7b67e39e1c1cb | |
| parent | 521002637a7b4e6ad4c48c36b0374fa166e6c866 (diff) | |
Add meta-closes-bugnum to gbp-pq as well
since it's used with "export --commit".
| -rw-r--r-- | docs/manpages/gbp-pq.sgml | 28 | ||||
| -rwxr-xr-x | gbp/scripts/pq.py | 1 |
2 files changed, 28 insertions, 1 deletions
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml index d913ef8e..8aa3fdd1 100644 --- a/docs/manpages/gbp-pq.sgml +++ b/docs/manpages/gbp-pq.sgml @@ -27,6 +27,8 @@ <arg><option>--time-machine=</option><replaceable>num</replaceable></arg> <arg><option>--[no-]drop</option></arg> <arg><option>--force</option></arg> + <arg><option>--meta-closes=bug-close-tags</option></arg> + <arg><option>--meta-closes-bugnum=bug-number-format</option></arg> <group choice="plain"> <arg><option>drop</option></arg> <arg><option>export</option></arg> @@ -203,7 +205,31 @@ exists</para> </listitem> </varlistentry> - </variablelist> + <varlistentry> + <term><option>--meta-closes=</option><replaceable>bug-close-tags</replaceable> + </term> + <listitem> + <para> + What meta tags to look for to generate a commit message when + using <option>export</option> <option>--commit</option>. + The default is 'Closes|LP' to support Debian and Launchpad. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--meta-closes-bugnum=</option><replaceable>bug-number-format</replaceable> + </term> + <listitem> + <para> + What regular expression should be used to parse out the + bug number when using + <option>export</option> <option>--commit</option>. The + default is '(?:bug|issue)?\#?\s?\d+'. For details see + <xref linkend="man.gbp.dch">. + </para> + </listitem> + </varlistentry> + </variablelist> </refsect1> <refsect1> <title>TAGS</title> diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index cea5b68d..5dfe4c20 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -351,6 +351,7 @@ def build_parser(name): parser.add_config_file_option(option_name="color-scheme", dest="color_scheme") parser.add_config_file_option(option_name="meta-closes", dest="meta_closes") + parser.add_config_file_option(option_name="meta-closes-bugnum", dest="meta_closes_bugnum") return parser |