pq: move switch_pq() to common

So that it can be re-used by the upcoming pq-rpm tool.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py
index d3c07d17..f7bae233 100644
--- a/gbp/scripts/common/pq.py
+++ b/gbp/scripts/common/pq.py
@@ -304,3 +304,13 @@ def drop_pq(repo, branch):
         gbp.log.info("Dropped branch '%s'." % pq_branch)
     else:
         gbp.log.info("No patch queue branch found - doing nothing.")
+
+
+def switch_pq(repo, current):
+    """Switch to patch-queue branch if on base branch and vice versa"""
+    if is_pq_branch(current):
+        base = pq_branch_base(current)
+        gbp.log.info("Switching to %s" % base)
+        repo.checkout(base)
+    else:
+        switch_to_pq_branch(repo, current)
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 194145e8..c32a36f4 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -33,7 +33,7 @@ from gbp.patch_series import (PatchSeries, Patch)
 from gbp.scripts.common.pq import (is_pq_branch, pq_branch_name, pq_branch_base,
                                  parse_gbp_commands, format_patch,
                                  switch_to_pq_branch, apply_single_patch,
-                                 apply_and_commit_patch,
+                                 apply_and_commit_patch, switch_pq,
                                  drop_pq, get_maintainer_from_control)
 from gbp.dch import extract_bts_cmds
 
@@ -279,16 +279,6 @@ def rebase_pq(repo, branch):
     GitCommand("rebase")([base])
 
 
-def switch_pq(repo, current):
-    """Switch to patch-queue branch if on base branch and vice versa"""
-    if is_pq_branch(current):
-        base = pq_branch_base(current)
-        gbp.log.info("Switching to %s" % base)
-        repo.checkout(base)
-    else:
-        switch_to_pq_branch(repo, current)
-
-
 def build_parser(name):
     try:
         parser = GbpOptionParserDebian(command=os.path.basename(name),
diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py
index 910ce206..d88f7aed 100644
--- a/tests/13_test_gbp_pq.py
+++ b/tests/13_test_gbp_pq.py
@@ -21,7 +21,7 @@ import os
 import logging
 import unittest
 
-from gbp.scripts.pq import generate_patches, switch_pq, export_patches
+from gbp.scripts.pq import generate_patches, export_patches
 import gbp.scripts.common.pq as pq
 import gbp.patch_series
 import tests.testutils as testutils
@@ -145,12 +145,12 @@ class TestExport(testutils.DebianGitTestRepo):
         """Test if we drop the patch-queue branch with --drop"""
         repo = self.repo
         start = repo.get_branch()
-        pq = os.path.join('patch-queue', start)
-        switch_pq(repo, start)
-        self.assertEqual(repo.get_branch(), pq)
-        export_patches(repo, pq, TestExport.Options)
+        pq_branch = os.path.join('patch-queue', start)
+        pq.switch_pq(repo, start)
+        self.assertEqual(repo.get_branch(), pq_branch)
+        export_patches(repo, pq_branch, TestExport.Options)
         self.assertEqual(repo.get_branch(), start)
-        self.assertFalse(repo.has_branch(pq))
+        self.assertFalse(repo.has_branch(pq_branch))
 
 
 def _patch_path(name):