Rev 6418: Remove some more noise. in file:///home/vila/src/bzr/experimental/cached-branch-store/

Vincent Ladeuil v.ladeuil+lp at free.fr
Wed Jan 18 14:13:45 UTC 2012


At file:///home/vila/src/bzr/experimental/cached-branch-store/

------------------------------------------------------------
revno: 6418
revision-id: v.ladeuil+lp at free.fr-20120118141345-dqma73nd5jxx8yj6
parent: v.ladeuil+lp at free.fr-20120118140919-rlvdrhpc0nq1lbwi
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cached-branch-store
timestamp: Wed 2012-01-18 15:13:45 +0100
message:
  Remove some more noise.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2012-01-18 14:09:19 +0000
+++ b/bzrlib/config.py	2012-01-18 14:13:45 +0000
@@ -3370,17 +3370,6 @@
         self.branch = branch
         self.id = 'branch'
 
-    # FIXME: This is very handy to detect which callers forgot to lock the
-    # branch but break many bt.test_config tests. Either these tests should
-    # parametrized differently or better ways to achieve the branch locking
-    # should be found that don't require this.
-    def xget_mutable_section(self, section_id=None):
-        if self.branch.peek_lock_mode() != 'w':
-            from bzrlib import debug ; debug.set_trace()
-            raise AssertionError('The branch for %s is not write-locked'
-                                 % self.external_url())
-        return super(BranchStore, self).get_mutable_section(section_id)
-
 
 class ControlStore(LockableIniFileStore):
 

=== modified file 'bzrlib/tests/test_commit.py'
--- a/bzrlib/tests/test_commit.py	2012-01-18 14:09:19 +0000
+++ b/bzrlib/tests/test_commit.py	2012-01-18 14:13:45 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2012 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # 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



More information about the bazaar-commits mailing list