Rev 2798: Put checking for recursive commits back to the commit driver, not commit builder. in http://people.ubuntu.com/~robertc/baz2.0/commit

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/commit

------------------------------------------------------------
revno: 2798
revision-id: robertc at robertcollins.net-20070927213849-fo6b41yk0pfzym1x
parent: robertc at robertcollins.net-20070927211138-ebsu1bo1qz9f1w8n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Fri 2007-09-28 07:38:49 +1000
message:
  Put checking for recursive commits back to the commit driver, not commit builder.
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
=== modified file 'bzrlib/commit.py'
--- a/bzrlib/commit.py	2007-09-27 21:11:38 +0000
+++ b/bzrlib/commit.py	2007-09-27 21:38:49 +0000
@@ -247,6 +247,7 @@
         self.local = local
         self.master_branch = None
         self.master_locked = False
+        self.recursive = recursive
         self.rev_id = None
         if specific_files is not None:
             self.specific_files = sorted(
@@ -325,8 +326,6 @@
                     entries_title="Directory")
             self.builder = self.branch.get_commit_builder(self.parents,
                 self.config, timestamp, timezone, committer, revprops, rev_id)
-            # tell the builder about the chosen recursive behaviour
-            self.builder.recursive = recursive
             
             try:
                 # find the location being committed to
@@ -730,7 +729,7 @@
             # TODO: push this down into record_entry so the new ie can be set
             # directly.
             if kind == 'tree-reference':
-                if self.builder.recursive == 'down':
+                if self.recursive == 'down':
                     nested_revision_id = self._commit_nested_tree(
                         file_id, path)
                     content_summary = content_summary[:3] + (
@@ -766,7 +765,7 @@
                 self.work_tree.branch.repository
         try:
             return sub_tree.commit(message=None, revprops=self.revprops,
-                recursive=self.builder.recursive,
+                recursive=self.recursive,
                 message_callback=self.message_callback,
                 timestamp=self.timestamp, timezone=self.timezone,
                 committer=self.committer,