Rev 3604: (robertc) Further tweaks to tests and comments in the commit excludes in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3604
revision-id: pqm at pqm.ubuntu.com-20080805044416-k5w5uuy3l785e7cm
parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
parent: robertc at robertcollins.net-20080805041043-6krwcxp2ebhzbumy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-08-05 05:44:16 +0100
message:
  (robertc) Further tweaks to tests and comments in the commit excludes
  	feature. (Robert Collins, Andrew Bennetts)
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
    ------------------------------------------------------------
    revno: 3603.1.1
    revision-id: robertc at robertcollins.net-20080805041043-6krwcxp2ebhzbumy
    parent: pqm at pqm.ubuntu.com-20080805011407-wmq7130znc0e6c4x
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2008-08-05 14:10:43 +1000
    message:
      Further tweaks to tests and comments in the commit excludes feature.
    modified:
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2008-08-04 22:07:34 +0000
+++ b/bzrlib/commit.py	2008-08-05 04:10:43 +0000
@@ -758,8 +758,8 @@
                     # the path has a deleted parent, do not add it.
                     continue
             if exclude and is_inside_any(exclude, path):
-                # Skip - it is to be considered by the final copy-from-basis
-                # step.
+                # Skip excluded paths. Excluded paths are processed by
+                # _update_builder_with_changes.
                 continue
             content_summary = self.work_tree.path_content_summary(path)
             # Note that when a filter of specific files is given, we must only

=== modified file 'bzrlib/tests/workingtree_implementations/test_commit.py'
--- a/bzrlib/tests/workingtree_implementations/test_commit.py	2008-08-05 00:06:19 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_commit.py	2008-08-05 04:10:43 +0000
@@ -233,7 +233,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['a/', 'a/b'])
         tree.smart_add(['.'])
-        tree.commit('test', exclude=['a/b'])
+        tree.commit('test', specific_files=['a'], exclude=['a/b'])
         # If a/b was excluded it will still be 'added' in status.
         tree.lock_read()
         self.addCleanup(tree.unlock)