Merge lp:~jelmer/brz/commit-exclude into lp:brz

[Jelmer Vernooij]

Support excludes when using record_iter_changes() to create a commit.

Support excludes when using record_iter_changes() to create a commit.

[Martin Packman (gz)]

Seems like a step in the right direction as discussed.

review: Approve

=== modified file 'breezy/commit.py'
--- breezy/commit.py	2017-06-11 13:48:12 +0000
+++ breezy/commit.py	2017-06-18 22:43:28 +0000
@@ -75,6 +75,33 @@
 from .i18n import gettext
 
 
+def filter_excluded(iter_changes, exclude):
+    """Filter exclude filenames.
+
+    :param iter_changes: iter_changes function
+    :param exclude: List of paths to exclude
+    :return: iter_changes function
+    """
+    for change in iter_changes:
+        old_path = change[1][0]
+        new_path = change[1][1]
+
+        new_excluded = (new_path is not None and
+            is_inside_any(exclude, new_path))
+
+        old_excluded = (old_path is not None and
+            is_inside_any(exclude, old_path))
+
+        if old_excluded and new_excluded:
+            continue
+
+        if old_excluded or new_excluded:
+            # TODO(jelmer): Perhaps raise an error here instead?
+            continue
+
+        yield change
+
+
 class NullCommitReporter(object):
     """I report on progress of a commit."""
 
@@ -321,7 +348,6 @@
         # the command line parameters, and the repository has fast delta
         # generation. See bug 347649.
         self.use_record_iter_changes = (
-            not self.exclude and 
             not self.branch.repository._format.supports_tree_reference and
             (self.branch.repository._format.fast_deltas or
              len(self.parents) < 2))
@@ -383,9 +409,6 @@
         self.builder = self.branch.get_commit_builder(self.parents,
             self.config_stack, timestamp, timezone, committer, self.revprops,
             rev_id, lossy=lossy)
-        if not self.builder.supports_record_entry_contents and self.exclude:
-            self.builder.abort()
-            raise errors.ExcludesUnsupported(self.branch.repository)
 
         if self.builder.updates_branch and self.bound_branch:
             self.builder.abort()
@@ -663,6 +686,8 @@
         if self.use_record_iter_changes:
             iter_changes = self.work_tree.iter_changes(self.basis_tree,
                 specific_files=specific_files)
+            if self.exclude:
+                iter_changes = filter_excluded(iter_changes, self.exclude)
             iter_changes = self._filter_iter_changes(iter_changes)
             for file_id, path, fs_hash in self.builder.record_iter_changes(
                 self.work_tree, self.basis_revid, iter_changes):

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/test_commit.py	2017-06-18 22:43:28 +0000
@@ -25,7 +25,11 @@
     )
 from ..branch import Branch
 from ..bzr.bzrdir import BzrDirMetaFormat1
-from ..commit import Commit, NullCommitReporter
+from ..commit import (
+    Commit,
+    NullCommitReporter,
+    filter_excluded,
+    )
 from ..errors import (
     PointlessCommit,
     BzrError,
@@ -33,6 +37,7 @@
     LockContention,
     )
 from . import (
+    TestCase,
     TestCaseWithTransport,
     test_foreign,
     )
@@ -832,3 +837,35 @@
         tree2 = branch.create_checkout('repo/tree2')
         tree2.commit('message', rev_id='rev1')
         self.assertTrue(tree2.branch.repository.has_revision('rev1'))
+
+
+class FilterExcludedTests(TestCase):
+
+    def test_add_file_not_excluded(self):
+        changes = [
+            ('fid', (None, 'newpath'),
+             0, (False, False), ('pid', 'pid'), ('newpath', 'newpath'),
+             ('file', 'file'), (True, True))]
+        self.assertEqual(changes, list(filter_excluded(changes, ['otherpath'])))
+
+    def test_add_file_excluded(self):
+        changes = [
+            ('fid', (None, 'newpath'),
+             0, (False, False), ('pid', 'pid'), ('newpath', 'newpath'),
+             ('file', 'file'), (True, True))]
+        self.assertEqual([], list(filter_excluded(changes, ['newpath'])))
+
+    def test_delete_file_excluded(self):
+        changes = [
+            ('fid', ('somepath', None),
+             0, (False, None), ('pid', None), ('newpath', None),
+             ('file', None), (True, None))]
+        self.assertEqual([], list(filter_excluded(changes, ['somepath'])))
+
+    def test_move_from_or_to_excluded(self):
+        changes = [
+            ('fid', ('oldpath', 'newpath'),
+             0, (False, False), ('pid', 'pid'), ('oldpath', 'newpath'),
+             ('file', 'file'), (True, True))]
+        self.assertEqual([], list(filter_excluded(changes, ['oldpath'])))
+        self.assertEqual([], list(filter_excluded(changes, ['newpath'])))

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-06-15 23:41:34 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-06-18 22:43:28 +0000
@@ -96,6 +96,9 @@
   accessible for other users when it starts.
   (Joke de Buhr, Jelmer Vernooij, #475501)
 
+* Support ``brz commit -x`` in combination with iter_changes.
+  (Jelmer Vernooij, #796582, #403811, #694946, #268135, #299879)
+
 Documentation
 *************