Merge lp:~jelmer/brz/quilt-more into lp:brz

[Jelmer Vernooij]

Add quilt_delete call.

Add quilt_delete call.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/480/

=== modified file 'breezy/plugins/quilt/quilt.py'
--- breezy/plugins/quilt/quilt.py	2019-06-16 13:10:54 +0000
+++ breezy/plugins/quilt/quilt.py	2019-08-31 10:25:49 +0000
@@ -83,12 +83,18 @@
             series_file=self.series_file, quiet=quiet, force=force,
             refresh=refresh)
 
-    def push(self, patch, quiet=None):
+    def push(self, patch, quiet=None, force=None, refresh=None):
         return wrapper.quilt_push(
             self.tree.basedir, patch, patches_dir=self.patches_dir,
-            series_file=self.series_file, quiet=quiet)
+            series_file=self.series_file, quiet=quiet, force=force,
+            refresh=refresh)
 
     def pop(self, patch, quiet=None):
         return wrapper.quilt_pop(
             self.tree.basedir, patch, patches_dir=self.patches_dir,
             series_file=self.series_file, quiet=quiet)
+
+    def delete(self, patch, remove=False):
+        return wrapper.quilt_delete(
+            self.tree.basedir, patch, patches_dir=self.patches_dir,
+            series_file=self.series_file, remove=remove)

=== modified file 'breezy/plugins/quilt/tests/test_wrapper.py'
--- breezy/plugins/quilt/tests/test_wrapper.py	2019-06-15 11:47:16 +0000
+++ breezy/plugins/quilt/tests/test_wrapper.py	2019-08-31 10:25:49 +0000
@@ -23,6 +23,7 @@
 import os
 
 from ..wrapper import (
+    quilt_delete,
     quilt_pop_all,
     quilt_applied,
     quilt_unapplied,
@@ -71,7 +72,7 @@
         self.make_empty_quilt_dir("source")
         quilt_push_all("source", quiet=True)
 
-    def test_poph_all_empty(self):
+    def test_pop_all_empty(self):
         self.make_empty_quilt_dir("source")
         quilt_pop_all("source", quiet=True)
 
@@ -97,3 +98,18 @@
             ("source/patches/patch2.diff", "bazb ar")])
         self.assertEquals(["patch1.diff", "patch2.diff"],
                           quilt_unapplied("source", "patches"))
+
+    def test_delete(self):
+        source = self.make_empty_quilt_dir("source")
+        self.build_tree_contents([
+            ("source/patches/series", "patch1.diff\npatch2.diff"),
+            ("source/patches/patch1.diff", "foob ar"),
+            ("source/patches/patch2.diff", "bazb ar")])
+        quilt_delete("source", "patch1.diff", "patches", remove=False)
+        self.assertEqual(
+            ['patch2.diff'],
+            quilt_series(source, 'patches/series'))
+        quilt_delete("source", "patch2.diff", "patches", remove=True)
+        self.assertTrue(os.path.exists('source/patches/patch1.diff'))
+        self.assertFalse(os.path.exists('source/patches/patch2.diff'))
+        self.assertEqual([], quilt_series(source, 'patches/series'))

=== modified file 'breezy/plugins/quilt/wrapper.py'
--- breezy/plugins/quilt/wrapper.py	2019-06-16 13:10:54 +0000
+++ breezy/plugins/quilt/wrapper.py	2019-08-31 10:25:49 +0000
@@ -159,19 +159,45 @@
         patches_dir=patches_dir, series_file=series_file, quiet=quiet)
 
 
-def quilt_push(working_dir, patch, patches_dir=None, series_file=None, quiet=None):
+def quilt_push(working_dir, patch, patches_dir=None, series_file=None,
+               quiet=None, force=False, refresh=False):
     """Push a patch.
 
     :param working_dir: Directory to work in
     :param patch: Patch to push
     :param patches_dir: Optional patches directory
     :param series_file: Optional series file
+    :param force: Force push
+    :param refresh: Refresh
     """
+    args = []
+    if force:
+        args.append("-f")
+    if refresh:
+        args.append("--refresh")
     return run_quilt(
-        ["push", patch], working_dir=working_dir,
+        ["push", patch] + args, working_dir=working_dir,
         patches_dir=patches_dir, series_file=series_file, quiet=quiet)
 
 
+def quilt_delete(working_dir, patch, patches_dir=None, series_file=None,
+                 remove=False):
+    """Delete a patch.
+
+    :param working_dir: Directory to work in
+    :param patch: Patch to push
+    :param patches_dir: Optional patches directory
+    :param series_file: Optional series file
+    :param remove: Remove the patch file as well
+    """
+    args = []
+    if remove:
+        args.append("-r")
+    return run_quilt(
+        ["delete", patch] + args, working_dir=working_dir,
+        patches_dir=patches_dir, series_file=series_file)
+
+
 def quilt_upgrade(working_dir):
     return run_quilt(["upgrade"], working_dir=working_dir)