Add 'packaging-branch' cmdline option

This is the counterpart of 'debian-branch' (basically identical to that)
to not confuse rpm maintainers.

Also, adds this option to gbp-clone and gbp-pull commands (as an
alternative to the 'debian-branch option), which are usable for RPM in
their current form.

diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.sgml
index 9c32d0c83b442d31ec879a4c64d4884fc80b06b9..15f7d8f03e2a9de963d08f94d4bc861f2e53bde6 100644 (file)
--- a/docs/manpages/gbp-clone.sgml
+++ b/docs/manpages/gbp-clone.sgml
@@ -24,7 +24,10 @@
       <arg><option>--verbose</option></arg>
       <arg><option>--all</option></arg>
       <arg><option>--[no-]pristine-tar</option></arg>
-      <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+      <group>
+        <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+        <arg><option>--packaging-branch=</option><replaceable>branch_name</replaceable></arg>
+      </group>
       <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--depth=</option><replaceable>depth</replaceable></arg>
       <arg choice="plain"><replaceable>remote_uri</replaceable></arg>
@@ -59,6 +62,14 @@
          developed on, default is <replaceable>master</replaceable>.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--packaging-branch</option>=<replaceable>branch_name</replaceable>
+        </term>
+        <listitem>
+          <para>The branch the packaging is being maintained on.
+          Alternative to the <emphasis>--debian-branch</emphasis> option.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable>
         </term>

diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index 488042da2aad18ab315caf4ada23c3ea72a628d9..f796506c9acaf8b45966c2a75893a5af4ff4488b 100644 (file)
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -25,7 +25,10 @@
       <arg><option>--force=</option><replaceable>[merge|clean]</replaceable></arg>
       <arg><option>--redo-pq</option></arg>
       <arg><option>--[no-]pristine-tar</option></arg>
-      <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+      <group>
+        <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+        <arg><option>--packaging-branch=</option><replaceable>branch_name</replaceable></arg>
+      </group>
       <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
       <arg><option>--depth=</option><replaceable>depth</replaceable></arg>
     </cmdsynopsis>
@@ -69,6 +72,14 @@
          developed on, default is <replaceable>master</replaceable>.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--packaging-branch</option>=<replaceable>branch_name</replaceable>
+        </term>
+        <listitem>
+          <para>The branch the packaging is being maintained on.
+          Alternative to the <emphasis>--debian-branch</emphasis> option.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable>
         </term>

diff --git a/gbp/config.py b/gbp/config.py
index 99f07f4a5eb50009f634ffac61ce0c8a494934b1..81e667fa8cdd7134aef281f6166c59a11c985611 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -69,6 +69,7 @@ class GbpOptionParser(OptionParser):
     @type def_config_files: list
     """
     defaults = { 'debian-branch'   : 'master',
+                 'packaging-branch' : 'master',
                  'upstream-branch' : 'upstream',
                  'upstream-tree'   : 'TAG',
                  'pristine-tar'    : 'False',
@@ -132,6 +133,8 @@ class GbpOptionParser(OptionParser):
     help = {
              'debian-branch':
                   "branch the Debian package is being developed on, default is '%(debian-branch)s'",
+             'packaging-branch':
+                  "branch the packaging is being maintained on, rpm counterpart of the 'debian-branch' option, default is '%(packaging-branch)s'",
              'upstream-branch':
                   "upstream branch, default is '%(upstream-branch)s'",
              'upstream-tree':

diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
index 4d992df951a28070b721aa87da4e127decde2741..4f9277b408c8632a5af2c3bac47c40ffed02c980 100755 (executable)
--- a/gbp/scripts/clone.py
+++ b/gbp/scripts/clone.py
@@ -39,6 +39,7 @@ def parse_args (argv):
                             help="track all branches, not only debian and upstream")
     branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch")
     branch_group.add_config_file_option(option_name="debian-branch", dest="packaging_branch")
+    branch_group.add_config_file_option(option_name="packaging-branch", dest="packaging_branch")
     branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
     branch_group.add_option("--depth", action="store", dest="depth", default=0,
                             help="git history depth (for creating shallow clones)")

diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index e8f78197e7c3accf077427ece5eb609a31966692..d541c80d49ef76c5d25b82a555655560f56b8ac8 100755 (executable)
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -103,6 +103,7 @@ def main(argv):
                       help="redo the patch queue branch after a pull. Warning: this drops the old patch-queue branch")
     branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch")
     branch_group.add_config_file_option(option_name="debian-branch", dest="packaging_branch")
+    branch_group.add_config_file_option(option_name="packaging-branch", dest="packaging_branch")
     branch_group.add_boolean_config_file_option(option_name="pristine-tar", dest="pristine_tar")
     branch_group.add_option("--depth", action="store", dest="depth", default=0,
                             help="git history depth (for deepening shallow clones)")