[Pkg-bazaar-commits] ./bzr-loom/unstable r99: New upstream snapshot.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 99
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Tue 2009-05-05 17:29:05 +0200
message:
  New upstream snapshot.
modified:
  branch.py
  debian/changelog
    ------------------------------------------------------------
    revno: 84.4.8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: trunk
    timestamp: Sat 2009-02-28 22:02:28 +1100
    message:
      Fix Loom cloning with the bzr.dev API change.
    modified:
      branch.py
    ------------------------------------------------------------
    revno: 84.4.9
    committer: Aaron Bentley <aaron at aaronbentley.com>
    branch nick: bzr-loom-fallbacks
    timestamp: Wed 2009-04-15 16:04:03 -0400
    message:
      Support ignore_fallbacks
    modified:
      branch.py
-------------- next part --------------
=== modified file 'branch.py'
--- a/branch.py	2008-10-17 19:24:04 +0000
+++ b/branch.py	2009-04-15 20:04:03 +0000
@@ -226,13 +226,15 @@
         raise bzrlib.errors.UpgradeRequired(self.base)
 
     @needs_read_lock
-    def clone(self, to_bzrdir, revision_id=None):
+    def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
         """Clone the branch into to_bzrdir.
         
         This differs from the base clone by cloning the loom and 
         setting the current nick to the top of the loom.
         """
         result = self._format.initialize(to_bzrdir)
+        if repository_policy is not None:
+            repository_policy.configure_branch(result)
         self.copy_content_into(result, revision_id=revision_id)
         return result
 
@@ -799,7 +801,7 @@
             control_files.unlock()
         return self.open(a_bzrdir, _found=True, )
 
-    def open(self, a_bzrdir, _found=False):
+    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
         """Return the branch object for a_bzrdir
 
         _found is a private parameter, do not use it. It is used to indicate
@@ -814,7 +816,8 @@
         return self._branch_class(_format=self,
                           _control_files=control_files,
                           a_bzrdir=a_bzrdir,
-                          _repository=a_bzrdir.find_repository())
+                          _repository=a_bzrdir.find_repository(),
+                          ignore_fallbacks=ignore_fallbacks)
 
     def take_over(self, branch):
         """Take an existing bzrlib branch over into Loom format.

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-03-19 17:13:41 +0000
+++ b/debian/changelog	2009-05-05 15:29:05 +0000
@@ -1,9 +1,10 @@
-bzr-loom (1.4.0~bzr93-3) UNRELEASED; urgency=low
+bzr-loom (1.4.0~bzr95-3) unstable; urgency=low
 
   * Move to section vcs.
   * Bump standards version to 3.8.1.
+  * New upstream snapshot.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Thu, 19 Mar 2009 18:13:31 +0100
+ -- Jelmer Vernooij <jelmer at debian.org>  Tue, 05 May 2009 17:29:03 +0200
 
 bzr-loom (1.4.0~bzr93-2) unstable; urgency=low