Merge lp:~jelmer/brz/import-patch into lp:brz

[Jelmer Vernooij]

Import the 'patch' command from bzrtools.

Import the 'patch' command from bzrtools.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

review: Approve

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

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/307/

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-05-29 05:24:46 +0000
+++ breezy/builtins.py	2019-06-01 01:20:30 +0000
@@ -7001,6 +7001,30 @@
             grep.versioned_grep(opts)
 
 
+class cmd_patch(Command):
+    """Apply a named patch to the current tree.
+
+    """
+    takes_args = ['filename?']
+    takes_options = [Option('strip', type=int, short_name='p',
+                            help=("Strip the smallest prefix containing num "
+                                  "leading slashes from filenames.")),
+                     Option('silent', help='Suppress chatter.')]
+
+    def run(self, filename=None, strip=None, silent=False):
+        from .patch import patch_tree
+        wt = WorkingTree.open_containing('.')[0]
+        if strip is None:
+            strip = 1
+        my_file = None
+        if filename is None:
+            my_file = getattr(sys.stdin, 'buffer', sys.stdin)
+        else:
+            my_file = open(filename, 'rb')
+        patches = [my_file.read()]
+        return patch_tree(wt, patches, strip, quiet=is_quiet(), out=self.outf)
+
+
 class cmd_resolve_location(Command):
     __doc__ = """Expand a location to a full URL.
 

=== modified file 'breezy/patch.py'
--- breezy/patch.py	2017-05-22 00:56:52 +0000
+++ breezy/patch.py	2019-06-01 01:20:30 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2005, 2006 Canonical Ltd
+# Copyright (C) 2005, 2008 Aaron Bentley, 2006 Michael Ellerman
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,16 +17,30 @@
 
 from __future__ import absolute_import
 
+"""Diff and patch functionality"""
+
 import errno
 import os
 from subprocess import Popen, PIPE
+import sys
 
-from .errors import NoDiff3
+from .errors import NoDiff3, BzrError
 from .textfile import check_text_path
 
-"""Diff and patch functionality"""
-
-__docformat__ = "restructuredtext"
+class PatchFailed(BzrError):
+
+    _fmt = """Patch application failed"""
+
+
+class PatchInvokeError(BzrError):
+
+    _fmt = """Error invoking patch: %(errstr)s%(stderr)s"""
+    internal_error = False
+
+    def __init__(self, e, stderr=''):
+        self.exception = e
+        self.errstr = os.strerror(e.errno)
+        self.stderr = '\n' + stderr
 
 
 _do_close_fds = True
@@ -96,9 +111,67 @@
             raise
     if status not in (0, 1):
         raise Exception(stderr)
-    f = open(out_file, 'wb')
-    try:
+    with open(out_file, 'wb') as f:
         f.write(output)
-    finally:
-        f.close()
     return status
+
+
+def patch_tree(tree, patches, strip=0, reverse=False, dry_run=False,
+               quiet=False, out=None):
+    """Apply a patch to a tree.
+
+    Args:
+      tree: A MutableTree object
+      patches: list of patches as bytes
+      strip: Strip X segments of paths
+      reverse: Apply reversal of patch
+      dry_run: Dry run
+    """
+    return run_patch(tree.basedir, patches, strip, reverse, dry_run,
+                     quiet, out=out)
+
+
+def run_patch(directory, patches, strip=0, reverse=False, dry_run=False,
+              quiet=False, _patch_cmd='patch', target_file=None, out=None):
+    args = [_patch_cmd, '-d', directory, '-s', '-p%d' % strip, '-f']
+    if quiet:
+        args.append('--quiet')
+
+    if sys.platform == "win32":
+        args.append('--binary')
+
+    if reverse:
+        args.append('-R')
+    if dry_run:
+        if sys.platform.startswith('freebsd'):
+            args.append('--check')
+        else:
+            args.append('--dry-run')
+        stderr = PIPE
+    else:
+        stderr = None
+    if target_file is not None:
+        args.append(target_file)
+
+    try:
+        process = Popen(args, stdin=PIPE, stdout=PIPE, stderr=stderr)
+    except OSError as e:
+        raise PatchInvokeError(e)
+    try:
+        for patch in patches:
+            process.stdin.write(bytes(patch))
+        process.stdin.close()
+
+    except IOError as e:
+        raise PatchInvokeError(e, process.stderr.read())
+
+    result = process.wait()
+    if not dry_run:
+        if out is not None:
+            out.write(process.stdout.read())
+        else:
+            process.stdout.read()
+    if result != 0:
+        raise PatchFailed()
+
+    return result

=== modified file 'breezy/tests/blackbox/__init__.py'
--- breezy/tests/blackbox/__init__.py	2019-02-24 00:57:44 +0000
+++ breezy/tests/blackbox/__init__.py	2019-06-01 01:20:30 +0000
@@ -92,6 +92,7 @@
         'test_non_ascii',
         'test_outside_wt',
         'test_pack',
+        'test_patch',
         'test_ping',
         'test_plugins',
         'test_pull',

=== added file 'breezy/tests/blackbox/test_patch.py'
--- breezy/tests/blackbox/test_patch.py	1970-01-01 00:00:00 +0000
+++ breezy/tests/blackbox/test_patch.py	2019-06-01 01:20:30 +0000
@@ -0,0 +1,36 @@
+# Copyright (C) 2019 Breezy Developers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+from breezy.tests import TestCaseWithTransport
+
+
+class TestPatch(TestCaseWithTransport):
+
+    def test_patch(self):
+        self.run_bzr('init')
+        with open('myfile', 'w') as f:
+            f.write('hello')
+        self.run_bzr('add')
+        self.run_bzr('commit -m hello')
+        with open('myfile', 'w') as f:
+            f.write('goodbye')
+        with open('mypatch', 'w') as f:
+            f.write(self.run_bzr('diff -p1', retcode=1)[0])
+        self.run_bzr('revert')
+        self.assertFileEqual('hello', 'myfile')
+        self.run_bzr('patch -p1 --silent mypatch')
+        self.assertFileEqual('goodbye', 'myfile')

=== modified file 'breezy/tests/test_patch.py'
--- breezy/tests/test_patch.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_patch.py	2019-06-01 01:20:30 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2006 Canonical Ltd
+# Copyright (C) 2008 Aaron Bentley <[e-mail]>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from breezy.errors import BinaryFile
-from breezy.patch import diff3
+from breezy.patch import diff3, PatchInvokeError, run_patch
 from breezy.tests import TestCaseInTempDir
 
 
@@ -29,3 +30,10 @@
         with open('base', 'wb') as f:
             f.write(b'\x00')
         self.assertRaises(BinaryFile, diff3, 'unused', 'this', 'other', 'base')
+
+
+class TestPatch(TestCaseInTempDir):
+
+    def test_missing_patch(self):
+        self.assertRaises(PatchInvokeError, run_patch, '.', [],
+                          _patch_cmd='/unlikely/to/exist')

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-03-06 14:23:50 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-06-01 01:20:30 +0000
@@ -21,6 +21,9 @@
 
 .. New commands, options, etc that users may wish to try out.
 
+ * The 'patch' command is now bundled with brz.
+   Imported from bzrtools by Aaron Bentley. (Jelmer Vernooij)
+
 Improvements
 ************