~bzr-pqm/bzr/bzr.dev

1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1
# Copyright (C) 2005, 2006 Canonical Ltd
1553.5.70 by Martin Pool
doc
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1553.5.70 by Martin Pool
doc
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1553.5.70 by Martin Pool
doc
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
18
from cStringIO import StringIO
19
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
22
from copy import deepcopy
23
from unittest import TestSuite
1372 by Martin Pool
- avoid converting inventories to/from StringIO
24
from warnings import warn
1553.5.70 by Martin Pool
doc
25
1 by mbp at sourcefrog
import from baz patch-364
26
import bzrlib
1551.8.4 by Aaron Bentley
Tweak import style
27
from bzrlib import (
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
28
        bzrdir,
29
        cache_utf8,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
30
        config as _mod_config,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
31
        errors,
32
        lockdir,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
33
        lockable_files,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
34
        osutils,
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
35
        revision as _mod_revision,
1911.2.9 by John Arbash Meinel
Fix accidental import removal
36
        transport,
1551.8.4 by Aaron Bentley
Tweak import style
37
        tree,
38
        ui,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
39
        urlutils,
1551.8.4 by Aaron Bentley
Tweak import style
40
        )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
43
""")
44
1534.4.28 by Robert Collins
first cut at merge from integration.
45
from bzrlib.decorators import needs_read_lock, needs_write_lock
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
46
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
47
                           HistoryMissing, InvalidRevisionId,
48
                           InvalidRevisionNumber, LockError, NoSuchFile,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
49
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
50
                           NotBranchError, UninitializableFormat,
51
                           UnlistableStore, UnlistableBranch,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
52
                           )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
53
from bzrlib.symbol_versioning import (deprecated_function,
54
                                      deprecated_method,
55
                                      DEPRECATED_PARAMETER,
56
                                      deprecated_passed,
1770.2.12 by Aaron Bentley
Merge bzr.dev
57
                                      zero_eight, zero_nine,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
58
                                      )
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
59
from bzrlib.trace import mutter, note
1104 by Martin Pool
- Add a simple UIFactory
60
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
61
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
62
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
63
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1429 by Robert Collins
merge in niemeyers prefixed-store patch
64
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
65
66
67
# TODO: Maybe include checks for common corruption of newlines, etc?
1 by mbp at sourcefrog
import from baz patch-364
68
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
69
# TODO: Some operations like log might retrieve the same revisions
70
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
71
# cache in memory to make this faster.  In general anything can be
1185.65.29 by Robert Collins
Implement final review suggestions.
72
# cached in memory between lock and unlock operations. .. nb thats
73
# what the transaction identity map provides
416 by Martin Pool
- bzr log and bzr root now accept an http URL
74
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
75
1 by mbp at sourcefrog
import from baz patch-364
76
######################################################################
77
# branch objects
78
558 by Martin Pool
- All top-level classes inherit from object
79
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
80
    """Branch holding a history of revisions.
81
343 by Martin Pool
doc
82
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
83
        Base directory/url of the branch.
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
84
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
85
    hooks: An instance of BranchHooks.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
86
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
87
    # this is really an instance variable - FIXME move it there
88
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
89
    base = None
90
91
    def __init__(self, *ignored, **ignored_too):
92
        raise NotImplementedError('The Branch class is abstract')
93
1687.1.8 by Robert Collins
Teach Branch about break_lock.
94
    def break_lock(self):
95
        """Break a lock if one is present from another instance.
96
97
        Uses the ui factory to ask for confirmation if the lock may be from
98
        an active process.
99
100
        This will probe the repository for its lock as well.
101
        """
102
        self.control_files.break_lock()
103
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
104
        master = self.get_master_branch()
105
        if master is not None:
106
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
107
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
108
    @staticmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
109
    @deprecated_method(zero_eight)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
110
    def open_downlevel(base):
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
111
        """Open a branch which may be of an old format."""
112
        return Branch.open(base, _unsupported=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
113
        
114
    @staticmethod
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
115
    def open(base, _unsupported=False):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
116
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
117
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
118
        For instance, if the branch is at URL/.bzr/branch,
119
        Branch.open(URL) -> a Branch instance.
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
120
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
121
        control = bzrdir.BzrDir.open(base, _unsupported)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
122
        return control.open_branch(_unsupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
123
124
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
125
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
126
        """Open an existing branch which contains url.
127
        
128
        This probes for a branch at url, and searches upwards from there.
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
129
130
        Basically we keep looking up until we find the control directory or
131
        run into the root.  If there isn't one, raises NotBranchError.
1534.4.22 by Robert Collins
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch.
132
        If there is one and it is either an unrecognised format or an unsupported 
133
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
134
        If there is one, it is returned, along with the unused portion of url.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
135
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
136
        control, relpath = bzrdir.BzrDir.open_containing(url)
137
        return control.open_branch(), relpath
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
138
139
    @staticmethod
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
140
    @deprecated_function(zero_eight)
141
    def initialize(base):
142
        """Create a new working tree and branch, rooted at 'base' (url)
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
143
144
        NOTE: This will soon be deprecated in favour of creation
145
        through a BzrDir.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
146
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
147
        return bzrdir.BzrDir.create_standalone_workingtree(base).branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
148
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
149
    @deprecated_function(zero_eight)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
150
    def setup_caching(self, cache_root):
151
        """Subclasses that care about caching should override this, and set
152
        up cached stores located under cache_root.
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
153
        
154
        NOTE: This is unused.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
155
        """
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
156
        pass
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
157
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
158
    def get_config(self):
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
159
        return BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
160
1185.35.11 by Aaron Bentley
Added support for branch nicks
161
    def _get_nick(self):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
162
        return self.get_config().get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
163
164
    def _set_nick(self, nick):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
165
        self.get_config().set_user_option('nickname', nick)
1185.35.11 by Aaron Bentley
Added support for branch nicks
166
167
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
168
169
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
170
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
171
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
172
    def lock_write(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
173
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
174
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
175
    def lock_read(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
176
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
177
178
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
179
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
180
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
181
    def peek_lock_mode(self):
182
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
183
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
184
1694.2.6 by Martin Pool
[merge] bzr.dev
185
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
186
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
187
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
188
    def abspath(self, name):
189
        """Return absolute filename for something in the branch
190
        
191
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
192
        method and not a tree method.
193
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
194
        raise NotImplementedError(self.abspath)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
195
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
196
    def bind(self, other):
197
        """Bind the local branch the other branch.
198
199
        :param other: The branch to bind to
200
        :type other: Branch
201
        """
202
        raise errors.UpgradeRequired(self.base)
203
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
204
    @needs_write_lock
205
    def fetch(self, from_branch, last_revision=None, pb=None):
206
        """Copy revisions from from_branch into this branch.
207
208
        :param from_branch: Where to copy from.
209
        :param last_revision: What revision to stop at (None for at the end
210
                              of the branch.
211
        :param pb: An optional progress bar to use.
212
213
        Returns the copied revision count and the failed revisions in a tuple:
214
        (copied, failures).
215
        """
216
        if self.base == from_branch.base:
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
217
            return (0, [])
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
218
        if pb is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
219
            nested_pb = ui.ui_factory.nested_progress_bar()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
220
            pb = nested_pb
221
        else:
222
            nested_pb = None
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
223
224
        from_branch.lock_read()
225
        try:
226
            if last_revision is None:
227
                pb.update('get source history')
228
                from_history = from_branch.revision_history()
229
                if from_history:
230
                    last_revision = from_history[-1]
231
                else:
232
                    # no history in the source branch
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
233
                    last_revision = _mod_revision.NULL_REVISION
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
234
            return self.repository.fetch(from_branch.repository,
235
                                         revision_id=last_revision,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
236
                                         pb=nested_pb)
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
237
        finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
238
            if nested_pb is not None:
239
                nested_pb.finished()
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
240
            from_branch.unlock()
241
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
242
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
243
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
244
245
        Older format branches cannot bind, please be sure to use a metadir
246
        branch.
247
        """
248
        return None
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
249
    
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
250
    def get_commit_builder(self, parents, config=None, timestamp=None, 
251
                           timezone=None, committer=None, revprops=None, 
252
                           revision_id=None):
253
        """Obtain a CommitBuilder for this branch.
254
        
255
        :param parents: Revision ids of the parents of the new revision.
256
        :param config: Optional configuration to use.
257
        :param timestamp: Optional timestamp recorded for commit.
258
        :param timezone: Optional timezone for timestamp.
259
        :param committer: Optional committer to set for commit.
260
        :param revprops: Optional dictionary of revision properties.
261
        :param revision_id: Optional revision id.
262
        """
263
264
        if config is None:
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
265
            config = self.get_config()
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
266
        
267
        return self.repository.get_commit_builder(self, parents, config, 
268
            timestamp, timezone, committer, revprops, revision_id)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
269
270
    def get_master_branch(self):
271
        """Return the branch we are bound to.
272
        
273
        :return: Either a Branch, or None
274
        """
275
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
276
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
277
    def get_revision_delta(self, revno):
278
        """Return the delta for one revision.
279
280
        The delta is relative to its mainline predecessor, or the
281
        empty tree for revision 1.
282
        """
283
        assert isinstance(revno, int)
284
        rh = self.revision_history()
285
        if not (1 <= revno <= len(rh)):
286
            raise InvalidRevisionNumber(revno)
287
        return self.repository.get_revision_delta(rh[revno-1])
288
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
289
    def get_root_id(self):
290
        """Return the id of this branches root"""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
291
        raise NotImplementedError(self.get_root_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
292
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
293
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
294
        """Print `file` to stdout."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
295
        raise NotImplementedError(self.print_file)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
296
297
    def append_revision(self, *revision_ids):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
298
        raise NotImplementedError(self.append_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
299
300
    def set_revision_history(self, rev_history):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
301
        raise NotImplementedError(self.set_revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
302
303
    def revision_history(self):
304
        """Return sequence of revision hashes on to this branch."""
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
305
        raise NotImplementedError(self.revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
306
307
    def revno(self):
308
        """Return current revision number for this branch.
309
310
        That is equivalent to the number of revisions committed to
311
        this branch.
312
        """
313
        return len(self.revision_history())
314
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
315
    def unbind(self):
316
        """Older format branches cannot bind or unbind."""
317
        raise errors.UpgradeRequired(self.base)
318
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
319
    def last_revision(self):
1819.1.7 by Martin Pool
Fix up code to get revision_id of bzr for benchmark log file
320
        """Return last revision id, or None"""
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
321
        ph = self.revision_history()
322
        if ph:
323
            return ph[-1]
324
        else:
325
            return None
326
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
327
    def missing_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
328
        """Return a list of new revisions that would perfectly fit.
329
        
330
        If self and other have not diverged, return a list of the revisions
331
        present in other, but missing from self.
332
        """
333
        self_history = self.revision_history()
334
        self_len = len(self_history)
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
335
        other_history = other.revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
336
        other_len = len(other_history)
337
        common_index = min(self_len, other_len) -1
338
        if common_index >= 0 and \
339
            self_history[common_index] != other_history[common_index]:
340
            raise DivergedBranches(self, other)
341
342
        if stop_revision is None:
343
            stop_revision = other_len
344
        else:
345
            assert isinstance(stop_revision, int)
346
            if stop_revision > other_len:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
347
                raise errors.NoSuchRevision(self, stop_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
348
        return other_history[self_len:stop_revision]
1185.66.1 by Aaron Bentley
Merged from mainline
349
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
350
    def update_revisions(self, other, stop_revision=None):
1505.1.16 by John Arbash Meinel
[merge] robertc's integration, updated tests to check for retcode=3
351
        """Pull in new perfect-fit revisions.
352
353
        :param other: Another Branch to pull from
354
        :param stop_revision: Updated until the given revision
355
        :return: None
356
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
357
        raise NotImplementedError(self.update_revisions)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
358
359
    def revision_id_to_revno(self, revision_id):
360
        """Given a revision id, return its revno"""
361
        if revision_id is None:
362
            return 0
363
        history = self.revision_history()
364
        try:
365
            return history.index(revision_id) + 1
366
        except ValueError:
367
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
368
369
    def get_rev_id(self, revno, history=None):
370
        """Find the revision id of the specified revno."""
371
        if revno == 0:
372
            return None
373
        if history is None:
374
            history = self.revision_history()
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
375
        if revno <= 0 or revno > len(history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
376
            raise bzrlib.errors.NoSuchRevision(self, revno)
377
        return history[revno - 1]
378
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
379
    def pull(self, source, overwrite=False, stop_revision=None):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
380
        raise NotImplementedError(self.pull)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
381
382
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
383
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
384
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
385
386
    def rename_one(self, from_rel, to_rel):
387
        """Rename one file.
388
389
        This can change the directory or the filename or both.
390
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
391
        raise NotImplementedError(self.rename_one)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
392
393
    def move(self, from_paths, to_name):
394
        """Rename files.
395
396
        to_name must exist as a versioned directory.
397
398
        If to_name exists and is a directory, the files are moved into
399
        it, keeping their old names.  If it is a directory, 
400
401
        Note that to_name is only the last component of the new name;
402
        this doesn't change the directory.
403
404
        This returns a list of (from_path, to_path) pairs for each
405
        entry that is moved.
406
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
407
        raise NotImplementedError(self.move)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
408
409
    def get_parent(self):
410
        """Return the parent location of the branch.
411
412
        This is the default location for push/pull/missing.  The usual
413
        pattern is that the user can override it by specifying a
414
        location.
415
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
416
        raise NotImplementedError(self.get_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
417
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
418
    def get_submit_branch(self):
419
        """Return the submit location of the branch.
420
421
        This is the default location for bundle.  The usual
422
        pattern is that the user can override it by specifying a
423
        location.
424
        """
425
        return self.get_config().get_user_option('submit_branch')
426
427
    def set_submit_branch(self, location):
428
        """Return the submit location of the branch.
429
430
        This is the default location for bundle.  The usual
431
        pattern is that the user can override it by specifying a
432
        location.
433
        """
434
        self.get_config().set_user_option('submit_branch', location)
435
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
436
    def get_push_location(self):
437
        """Return the None or the location to push this branch to."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
438
        raise NotImplementedError(self.get_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
439
440
    def set_push_location(self, location):
441
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
442
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
443
444
    def set_parent(self, url):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
445
        raise NotImplementedError(self.set_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
446
1587.1.10 by Robert Collins
update updates working tree and branch together.
447
    @needs_write_lock
448
    def update(self):
449
        """Synchronise this branch with the master branch if any. 
450
451
        :return: None or the last_revision pivoted out during the update.
452
        """
453
        return None
454
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
455
    def check_revno(self, revno):
456
        """\
457
        Check whether a revno corresponds to any revision.
458
        Zero (the NULL revision) is considered valid.
459
        """
460
        if revno != 0:
461
            self.check_real_revno(revno)
462
            
463
    def check_real_revno(self, revno):
464
        """\
465
        Check whether a revno corresponds to a real revision.
466
        Zero (the NULL revision) is considered invalid
467
        """
468
        if revno < 1 or revno > self.revno():
469
            raise InvalidRevisionNumber(revno)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
470
471
    @needs_read_lock
472
    def clone(self, *args, **kwargs):
473
        """Clone this branch into to_bzrdir preserving all semantic values.
474
        
475
        revision_id: if not None, the revision history in the new branch will
476
                     be truncated to end with revision_id.
477
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
478
        # for API compatibility, until 0.8 releases we provide the old api:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
479
        # def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
480
        # after 0.8 releases, the *args and **kwargs should be changed:
481
        # def clone(self, to_bzrdir, revision_id=None):
482
        if (kwargs.get('to_location', None) or
483
            kwargs.get('revision', None) or
484
            kwargs.get('basis_branch', None) or
485
            (len(args) and isinstance(args[0], basestring))):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
486
            # backwards compatibility api:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
487
            warn("Branch.clone() has been deprecated for BzrDir.clone() from"
488
                 " bzrlib 0.8.", DeprecationWarning, stacklevel=3)
489
            # get basis_branch
490
            if len(args) > 2:
491
                basis_branch = args[2]
492
            else:
493
                basis_branch = kwargs.get('basis_branch', None)
494
            if basis_branch:
495
                basis = basis_branch.bzrdir
496
            else:
497
                basis = None
498
            # get revision
499
            if len(args) > 1:
500
                revision_id = args[1]
501
            else:
502
                revision_id = kwargs.get('revision', None)
503
            # get location
504
            if len(args):
505
                url = args[0]
506
            else:
507
                # no default to raise if not provided.
508
                url = kwargs.get('to_location')
509
            return self.bzrdir.clone(url,
510
                                     revision_id=revision_id,
511
                                     basis=basis).open_branch()
512
        # new cleaner api.
513
        # generate args by hand 
514
        if len(args) > 1:
515
            revision_id = args[1]
516
        else:
517
            revision_id = kwargs.get('revision_id', None)
518
        if len(args):
519
            to_bzrdir = args[0]
520
        else:
521
            # no default to raise if not provided.
522
            to_bzrdir = kwargs.get('to_bzrdir')
523
        result = self._format.initialize(to_bzrdir)
524
        self.copy_content_into(result, revision_id=revision_id)
525
        return  result
526
527
    @needs_read_lock
528
    def sprout(self, to_bzrdir, revision_id=None):
529
        """Create a new line of development from the branch, into to_bzrdir.
530
        
531
        revision_id: if not None, the revision history in the new branch will
532
                     be truncated to end with revision_id.
533
        """
534
        result = self._format.initialize(to_bzrdir)
535
        self.copy_content_into(result, revision_id=revision_id)
536
        result.set_parent(self.bzrdir.root_transport.base)
537
        return result
538
539
    @needs_read_lock
540
    def copy_content_into(self, destination, revision_id=None):
541
        """Copy the content of self into destination.
542
543
        revision_id: if not None, the revision history in the new branch will
544
                     be truncated to end with revision_id.
545
        """
546
        new_history = self.revision_history()
547
        if revision_id is not None:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
548
            try:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
549
                new_history = new_history[:new_history.index(revision_id) + 1]
550
            except ValueError:
551
                rev = self.repository.get_revision(revision_id)
552
                new_history = rev.get_history(self.repository)[1:]
553
        destination.set_revision_history(new_history)
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
554
        try:
555
            parent = self.get_parent()
556
        except errors.InaccessibleParent, e:
557
            mutter('parent was not accessible to copy: %s', e)
558
        else:
559
            if parent:
560
                destination.set_parent(parent)
1185.66.1 by Aaron Bentley
Merged from mainline
561
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
562
    @needs_read_lock
563
    def check(self):
564
        """Check consistency of the branch.
565
566
        In particular this checks that revisions given in the revision-history
567
        do actually match up in the revision graph, and that they're all 
568
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
569
        
570
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
571
572
        :return: A BranchCheckResult.
573
        """
574
        mainline_parent_id = None
575
        for revision_id in self.revision_history():
576
            try:
577
                revision = self.repository.get_revision(revision_id)
578
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
579
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
580
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
581
            # In general the first entry on the revision history has no parents.
582
            # But it's not illegal for it to have parents listed; this can happen
583
            # in imports from Arch when the parents weren't reachable.
584
            if mainline_parent_id is not None:
585
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
586
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
587
                                        "parents of {%s}"
588
                                        % (mainline_parent_id, revision_id))
589
            mainline_parent_id = revision_id
590
        return BranchCheckResult(self)
591
1910.2.39 by Aaron Bentley
Fix checkout bug
592
    def _get_checkout_format(self):
593
        """Return the most suitable metadir for a checkout of this branch.
594
        Weaves are used if this branch's repostory uses weaves.
595
        """
596
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
597
            from bzrlib import repository
598
            format = bzrdir.BzrDirMetaFormat1()
599
            format.repository_format = repository.RepositoryFormat7()
600
        else:
1910.2.41 by Aaron Bentley
Clean up clone format creation
601
            format = self.repository.bzrdir.cloning_metadir()
1910.2.39 by Aaron Bentley
Fix checkout bug
602
        return format
603
1551.8.5 by Aaron Bentley
Change name to create_checkout
604
    def create_checkout(self, to_location, revision_id=None, 
605
                        lightweight=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
606
        """Create a checkout of a branch.
607
        
608
        :param to_location: The url to produce the checkout at
609
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
610
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
611
        produce a bound branch (heavyweight checkout)
612
        :return: The tree of the created checkout
613
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
614
        t = transport.get_transport(to_location)
615
        try:
616
            t.mkdir('.')
617
        except errors.FileExists:
618
            pass
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
619
        if lightweight:
620
            checkout = bzrdir.BzrDirMetaFormat1().initialize_on_transport(t)
621
            BranchReferenceFormat().initialize(checkout, self)
622
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
623
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
624
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
625
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
626
            checkout = checkout_branch.bzrdir
627
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
628
            # pull up to the specified revision_id to set the initial 
629
            # branch tip correctly, and seed it with history.
630
            checkout_branch.pull(self, stop_revision=revision_id)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
631
        return checkout.create_workingtree(revision_id)
632
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
633
634
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
635
    """An encapsulation of the initialization and open routines for a format.
636
637
    Formats provide three things:
638
     * An initialization routine,
639
     * a format string,
640
     * an open routine.
641
642
    Formats are placed in an dict by their format string for reference 
643
    during branch opening. Its not required that these be instances, they
644
    can be classes themselves with class methods - it simply depends on 
645
    whether state is needed for a given format or not.
646
647
    Once a format is deprecated, just deprecate the initialize and open
648
    methods on the format class. Do not deprecate the object, as the 
649
    object will be created every time regardless.
650
    """
651
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
652
    _default_format = None
653
    """The default format used for new branches."""
654
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
655
    _formats = {}
656
    """The known formats."""
657
658
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
659
    def find_format(klass, a_bzrdir):
660
        """Return the format for the branch object in a_bzrdir."""
661
        try:
662
            transport = a_bzrdir.get_branch_transport(None)
663
            format_string = transport.get("format").read()
664
            return klass._formats[format_string]
665
        except NoSuchFile:
666
            raise NotBranchError(path=transport.base)
667
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
668
            raise errors.UnknownFormatError(format=format_string)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
669
670
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
671
    def get_default_format(klass):
672
        """Return the current default format."""
673
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
674
675
    def get_format_string(self):
676
        """Return the ASCII format string that identifies this format."""
677
        raise NotImplementedError(self.get_format_string)
678
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
679
    def get_format_description(self):
680
        """Return the short format description for this format."""
681
        raise NotImplementedError(self.get_format_string)
682
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
683
    def initialize(self, a_bzrdir):
684
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
685
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
686
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
687
    def is_supported(self):
688
        """Is this format supported?
689
690
        Supported formats can be initialized and opened.
691
        Unsupported formats may not support initialization or committing or 
692
        some other features depending on the reason for not being supported.
693
        """
694
        return True
695
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
696
    def open(self, a_bzrdir, _found=False):
697
        """Return the branch object for a_bzrdir
698
699
        _found is a private parameter, do not use it. It is used to indicate
700
               if format probing has already be done.
701
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
702
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
703
704
    @classmethod
705
    def register_format(klass, format):
706
        klass._formats[format.get_format_string()] = format
707
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
708
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
709
    def set_default_format(klass, format):
710
        klass._default_format = format
711
712
    @classmethod
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
713
    def unregister_format(klass, format):
714
        assert klass._formats[format.get_format_string()] is format
715
        del klass._formats[format.get_format_string()]
716
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
717
    def __str__(self):
718
        return self.get_format_string().rstrip()
719
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
720
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
721
class BranchHooks(dict):
722
    """A dictionary mapping hook name to a list of callables for branch hooks.
723
    
724
    e.g. ['set_rh'] Is the list of items to be called when the
725
    set_revision_history function is invoked.
726
    """
727
728
    def __init__(self):
729
        """Create the default hooks.
730
731
        These are all empty initially, because by default nothing should get
732
        notified.
733
        """
734
        dict.__init__(self)
735
        # invoked whenever the revision history has been set
736
        # with set_revision_history. The api signature is
737
        # (branch, revision_history), and the branch will
738
        # be write-locked. Introduced in 0.15.
739
        self['set_rh'] = []
740
741
    def install_hook(self, hook_name, a_callable):
742
        """Install a_callable in to the hook hook_name.
743
744
        :param hook_name: A hook name. See the __init__ method of BranchHooks
745
            for the complete list of hooks.
746
        :param a_callable: The callable to be invoked when the hook triggers.
747
            The exact signature will depend on the hook - see the __init__ 
748
            method of BranchHooks for details on each hook.
749
        """
750
        try:
751
            self[hook_name].append(a_callable)
752
        except KeyError:
753
            raise errors.UnknownHook('branch', hook_name)
754
755
756
# install the default hooks into the Branch class.
757
Branch.hooks = BranchHooks()
758
759
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
760
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
761
    """Bzr branch format 4.
762
763
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
764
     - a revision-history file.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
765
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
766
    """
767
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
768
    def get_format_description(self):
769
        """See BranchFormat.get_format_description()."""
770
        return "Branch format 4"
771
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
772
    def initialize(self, a_bzrdir):
773
        """Create a branch of this format in a_bzrdir."""
774
        mutter('creating branch in %s', a_bzrdir.transport.base)
775
        branch_transport = a_bzrdir.get_branch_transport(self)
776
        utf8_files = [('revision-history', ''),
777
                      ('branch-name', ''),
778
                      ]
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
779
        control_files = lockable_files.LockableFiles(branch_transport,
780
                             'branch-lock', lockable_files.TransportLock)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
781
        control_files.create_lock()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
782
        control_files.lock_write()
783
        try:
784
            for file, content in utf8_files:
785
                control_files.put_utf8(file, content)
786
        finally:
787
            control_files.unlock()
788
        return self.open(a_bzrdir, _found=True)
789
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
790
    def __init__(self):
791
        super(BzrBranchFormat4, self).__init__()
792
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
793
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
794
    def open(self, a_bzrdir, _found=False):
795
        """Return the branch object for a_bzrdir
796
797
        _found is a private parameter, do not use it. It is used to indicate
798
               if format probing has already be done.
799
        """
800
        if not _found:
801
            # we are being called directly and must probe.
802
            raise NotImplementedError
803
        return BzrBranch(_format=self,
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
804
                         _control_files=a_bzrdir._control_files,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
805
                         a_bzrdir=a_bzrdir,
806
                         _repository=a_bzrdir.open_repository())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
807
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
808
    def __str__(self):
809
        return "Bazaar-NG branch format 4"
810
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
811
812
class BzrBranchFormat5(BranchFormat):
813
    """Bzr branch format 5.
814
815
    This format has:
816
     - a revision-history file.
817
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
818
     - a lock dir guarding the branch itself
819
     - all of this stored in a branch/ subdirectory
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
820
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
821
822
    This format is new in bzr 0.8.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
823
    """
824
825
    def get_format_string(self):
826
        """See BranchFormat.get_format_string()."""
827
        return "Bazaar-NG branch format 5\n"
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
828
829
    def get_format_description(self):
830
        """See BranchFormat.get_format_description()."""
831
        return "Branch format 5"
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
832
        
833
    def initialize(self, a_bzrdir):
834
        """Create a branch of this format in a_bzrdir."""
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
835
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
836
        branch_transport = a_bzrdir.get_branch_transport(self)
837
        utf8_files = [('revision-history', ''),
838
                      ('branch-name', ''),
839
                      ]
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
840
        control_files = lockable_files.LockableFiles(branch_transport, 'lock',
841
                                                     lockdir.LockDir)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
842
        control_files.create_lock()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
843
        control_files.lock_write()
844
        control_files.put_utf8('format', self.get_format_string())
845
        try:
846
            for file, content in utf8_files:
847
                control_files.put_utf8(file, content)
848
        finally:
849
            control_files.unlock()
850
        return self.open(a_bzrdir, _found=True, )
851
852
    def __init__(self):
853
        super(BzrBranchFormat5, self).__init__()
854
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
855
856
    def open(self, a_bzrdir, _found=False):
857
        """Return the branch object for a_bzrdir
858
859
        _found is a private parameter, do not use it. It is used to indicate
860
               if format probing has already be done.
861
        """
862
        if not _found:
863
            format = BranchFormat.find_format(a_bzrdir)
864
            assert format.__class__ == self.__class__
865
        transport = a_bzrdir.get_branch_transport(None)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
866
        control_files = lockable_files.LockableFiles(transport, 'lock',
867
                                                     lockdir.LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
868
        return BzrBranch5(_format=self,
869
                          _control_files=control_files,
870
                          a_bzrdir=a_bzrdir,
871
                          _repository=a_bzrdir.find_repository())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
872
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
873
    def __str__(self):
874
        return "Bazaar-NG Metadir branch format 5"
875
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
876
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
877
class BranchReferenceFormat(BranchFormat):
878
    """Bzr branch reference format.
879
880
    Branch references are used in implementing checkouts, they
881
    act as an alias to the real branch which is at some other url.
882
883
    This format has:
884
     - A location file
885
     - a format string
886
    """
887
888
    def get_format_string(self):
889
        """See BranchFormat.get_format_string()."""
890
        return "Bazaar-NG Branch Reference Format 1\n"
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
891
892
    def get_format_description(self):
893
        """See BranchFormat.get_format_description()."""
894
        return "Checkout reference format 1"
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
895
        
896
    def initialize(self, a_bzrdir, target_branch=None):
897
        """Create a branch of this format in a_bzrdir."""
898
        if target_branch is None:
899
            # this format does not implement branch itself, thus the implicit
900
            # creation contract must see it as uninitializable
901
            raise errors.UninitializableFormat(self)
902
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
903
        branch_transport = a_bzrdir.get_branch_transport(self)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
904
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
905
            target_branch.bzrdir.root_transport.base)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
906
        branch_transport.put_bytes('format', self.get_format_string())
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
907
        return self.open(a_bzrdir, _found=True)
908
909
    def __init__(self):
910
        super(BranchReferenceFormat, self).__init__()
911
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
912
913
    def _make_reference_clone_function(format, a_branch):
914
        """Create a clone() routine for a branch dynamically."""
915
        def clone(to_bzrdir, revision_id=None):
916
            """See Branch.clone()."""
917
            return format.initialize(to_bzrdir, a_branch)
918
            # cannot obey revision_id limits when cloning a reference ...
919
            # FIXME RBC 20060210 either nuke revision_id for clone, or
920
            # emit some sort of warning/error to the caller ?!
921
        return clone
922
923
    def open(self, a_bzrdir, _found=False):
924
        """Return the branch that the branch reference in a_bzrdir points at.
925
926
        _found is a private parameter, do not use it. It is used to indicate
927
               if format probing has already be done.
928
        """
929
        if not _found:
930
            format = BranchFormat.find_format(a_bzrdir)
931
            assert format.__class__ == self.__class__
932
        transport = a_bzrdir.get_branch_transport(None)
933
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
934
        result = real_bzrdir.open_branch()
935
        # this changes the behaviour of result.clone to create a new reference
936
        # rather than a copy of the content of the branch.
937
        # I did not use a proxy object because that needs much more extensive
938
        # testing, and we are only changing one behaviour at the moment.
939
        # If we decide to alter more behaviours - i.e. the implicit nickname
940
        # then this should be refactored to introduce a tested proxy branch
941
        # and a subclass of that for use in overriding clone() and ....
942
        # - RBC 20060210
943
        result.clone = self._make_reference_clone_function(result)
944
        return result
945
946
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
947
# formats which have no format string are not discoverable
948
# and not independently creatable, so are not registered.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
949
__default_format = BzrBranchFormat5()
950
BranchFormat.register_format(__default_format)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
951
BranchFormat.register_format(BranchReferenceFormat())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
952
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
953
_legacy_formats = [BzrBranchFormat4(),
954
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
955
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
956
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
957
    """A branch stored in the actual filesystem.
958
959
    Note that it's "local" in the context of the filesystem; it doesn't
960
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
961
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
962
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
963
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
964
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
965
                 relax_version_check=DEPRECATED_PARAMETER, _format=None,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
966
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
967
        """Create new branch object at a particular location.
968
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
969
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
970
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
971
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
972
             unversioned directory.  If False, the branch must already
973
             be versioned.
974
1293 by Martin Pool
- add Branch constructor option to relax version check
975
        relax_version_check -- If true, the usual check for the branch
976
            version is not applied.  This is intended only for
977
            upgrade/recovery type use; it's not guaranteed that
978
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
979
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
980
        if a_bzrdir is None:
981
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
982
        else:
983
            self.bzrdir = a_bzrdir
984
        self._transport = self.bzrdir.transport.clone('..')
1534.4.28 by Robert Collins
first cut at merge from integration.
985
        self._base = self._transport.base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
986
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
987
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
988
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
989
        self.control_files = _control_files
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
990
        if deprecated_passed(init):
991
            warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
992
                 "deprecated as of bzr 0.8. Please use Branch.create().",
993
                 DeprecationWarning,
994
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
995
            if init:
996
                # this is slower than before deprecation, oh well never mind.
997
                # -> its deprecated.
998
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
999
        self._check_format(_format)
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
1000
        if deprecated_passed(relax_version_check):
1001
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1002
                 "relax_version_check parameter is deprecated as of bzr 0.8. "
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1003
                 "Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1004
                 "open() method.",
1005
                 DeprecationWarning,
1006
                 stacklevel=2)
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
1007
            if (not relax_version_check
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1008
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
1009
                raise errors.UnsupportedFormatError(format=fmt)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1010
        if deprecated_passed(transport):
1011
            warn("BzrBranch.__init__(transport=XXX...): The transport "
1012
                 "parameter is deprecated as of bzr 0.8. "
1013
                 "Please use Branch.open, or bzrdir.open_branch().",
1014
                 DeprecationWarning,
1015
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1016
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1017
1 by mbp at sourcefrog
import from baz patch-364
1018
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1019
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1020
1021
    __repr__ = __str__
1022
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1023
    def _get_base(self):
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
1024
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1025
1442.1.5 by Robert Collins
Give branch.base a docstring.
1026
    base = property(_get_base, doc="The URL for the root of this branch.")
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
1027
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1028
    def _finish_transaction(self):
1029
        """Exit the current transaction."""
1185.65.13 by Robert Collins
Merge from integration
1030
        return self.control_files._finish_transaction()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1031
1032
    def get_transaction(self):
1185.65.13 by Robert Collins
Merge from integration
1033
        """Return the current active transaction.
1034
1035
        If no transaction is active, this returns a passthrough object
1036
        for which all data is immediately flushed and no caching happens.
1037
        """
1038
        # this is an explicit function so that we can do tricky stuff
1039
        # when the storage in rev_storage is elsewhere.
1040
        # we probably need to hook the two 'lock a location' and 
1041
        # 'have a transaction' together more delicately, so that
1042
        # we can have two locks (branch and storage) and one transaction
1043
        # ... and finishing the transaction unlocks both, but unlocking
1044
        # does not. - RBC 20051121
1045
        return self.control_files.get_transaction()
1046
1047
    def _set_transaction(self, transaction):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1048
        """Set a new active transaction."""
1185.65.13 by Robert Collins
Merge from integration
1049
        return self.control_files._set_transaction(transaction)
353 by Martin Pool
- Per-branch locks in read and write modes.
1050
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1051
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1052
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1053
        return self.control_files._transport.abspath(name)
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
1054
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
1055
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
1056
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
1057
1534.4.8 by Robert Collins
Unfuck upgrade.
1058
        The format is stored as a reference to the format object in
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1059
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
1060
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1061
        The format parameter is either None or the branch format class
1062
        used to open this branch.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1063
1064
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
1065
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1066
        if format is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1067
            format = BranchFormat.find_format(self.bzrdir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1068
        self._format = format
1069
        mutter("got branch format %s", self._format)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1070
1508.1.15 by Robert Collins
Merge from mpool.
1071
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1072
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1073
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1074
        tree = self.repository.revision_tree(self.last_revision())
1075
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1076
1694.2.6 by Martin Pool
[merge] bzr.dev
1077
    def is_locked(self):
1078
        return self.control_files.is_locked()
1079
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1080
    def lock_write(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1081
        self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1082
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1083
            self.control_files.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1084
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1085
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1086
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1087
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1088
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1089
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1090
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1091
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1092
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1093
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1094
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1095
1096
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1097
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1098
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1099
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1100
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1101
            self.repository.unlock()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1102
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1103
    def peek_lock_mode(self):
1104
        if self.control_files._lock_count == 0:
1105
            return None
1106
        else:
1107
            return self.control_files._lock_mode
1108
1694.2.6 by Martin Pool
[merge] bzr.dev
1109
    def get_physical_lock_status(self):
1110
        return self.control_files.get_physical_lock_status()
1111
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1112
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1113
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1114
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1115
        return self.repository.print_file(file, revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1116
1117
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1118
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1119
        """See Branch.append_revision."""
905 by Martin Pool
- merge aaron's append_multiple.patch
1120
        for revision_id in revision_ids:
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
1121
            _mod_revision.check_not_reserved_id(revision_id)
905 by Martin Pool
- merge aaron's append_multiple.patch
1122
            mutter("add {%s} to revision-history" % revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1123
        rev_history = self.revision_history()
1124
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1125
        self.set_revision_history(rev_history)
1126
1127
    @needs_write_lock
1128
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1129
        """See Branch.set_revision_history."""
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
1130
        self.control_files.put_utf8(
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1131
            'revision-history', '\n'.join(rev_history))
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1132
        transaction = self.get_transaction()
1133
        history = transaction.map.find_revision_history()
1134
        if history is not None:
1135
            # update the revision history in the identity map.
1136
            history[:] = list(rev_history)
1137
            # this call is disabled because revision_history is 
1138
            # not really an object yet, and the transaction is for objects.
1139
            # transaction.register_dirty(history)
1140
        else:
1141
            transaction.map.add_revision_history(rev_history)
1142
            # this call is disabled because revision_history is 
1143
            # not really an object yet, and the transaction is for objects.
1144
            # transaction.register_clean(history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1145
        for hook in Branch.hooks['set_rh']:
1146
            hook(self, rev_history)
233 by mbp at sourcefrog
- more output from test.sh
1147
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1148
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
1149
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1150
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1151
        transaction = self.get_transaction()
1152
        history = transaction.map.find_revision_history()
1153
        if history is not None:
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1154
            # mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
1155
            return list(history)
1911.2.4 by John Arbash Meinel
use cached strings for Branch.revision_history
1156
        decode_utf8 = cache_utf8.decode
1157
        history = [decode_utf8(l.rstrip('\r\n')) for l in
1158
                self.control_files.get('revision-history').readlines()]
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1159
        transaction.map.add_revision_history(history)
1160
        # this call is disabled because revision_history is 
1161
        # not really an object yet, and the transaction is for objects.
1162
        # transaction.register_clean(history, precious=True)
1163
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
1164
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1165
    @needs_write_lock
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1166
    def generate_revision_history(self, revision_id, last_rev=None, 
1167
        other_branch=None):
1168
        """Create a new revision history that will finish with revision_id.
1169
        
1170
        :param revision_id: the new tip to use.
1171
        :param last_rev: The previous last_revision. If not None, then this
1172
            must be a ancestory of revision_id, or DivergedBranches is raised.
1173
        :param other_branch: The other branch that DivergedBranches should
1174
            raise with respect to.
1175
        """
1176
        # stop_revision must be a descendant of last_revision
1177
        stop_graph = self.repository.get_revision_graph(revision_id)
1178
        if last_rev is not None and last_rev not in stop_graph:
1179
            # our previous tip is not merged into stop_revision
1180
            raise errors.DivergedBranches(self, other_branch)
1181
        # make a new revision history from the graph
1182
        current_rev_id = revision_id
1183
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1184
        while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1185
            new_history.append(current_rev_id)
1186
            current_rev_id_parents = stop_graph[current_rev_id]
1187
            try:
1188
                current_rev_id = current_rev_id_parents[0]
1189
            except IndexError:
1190
                current_rev_id = None
1191
        new_history.reverse()
1192
        self.set_revision_history(new_history)
1193
1194
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1195
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1196
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1197
        other.lock_read()
1198
        try:
1199
            if stop_revision is None:
1200
                stop_revision = other.last_revision()
1201
                if stop_revision is None:
1202
                    # if there are no commits, we're done.
1203
                    return
1204
            # whats the current last revision, before we fetch [and change it
1205
            # possibly]
1206
            last_rev = self.last_revision()
1207
            # we fetch here regardless of whether we need to so that we pickup
1208
            # filled in ghosts.
1209
            self.fetch(other, stop_revision)
1210
            my_ancestry = self.repository.get_ancestry(last_rev)
1211
            if stop_revision in my_ancestry:
1212
                # last_revision is a descendant of stop_revision
1213
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1214
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1215
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1216
        finally:
1217
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1218
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1219
    def basis_tree(self):
1220
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1221
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1222
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1223
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1224
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1225
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1226
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1227
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1228
        if (self.base.find('://') != -1 or 
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1229
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1230
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1231
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1232
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1233
    @needs_write_lock
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
1234
    def pull(self, source, overwrite=False, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1235
        """See Branch.pull."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1236
        source.lock_read()
1237
        try:
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1238
            old_count = len(self.revision_history())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1239
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1240
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1241
            except DivergedBranches:
1242
                if not overwrite:
1243
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1244
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1245
                self.set_revision_history(source.revision_history())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1246
            new_count = len(self.revision_history())
1247
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1248
        finally:
1249
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1250
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1251
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1252
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1253
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1254
        _locs = ['parent', 'pull', 'x-pull']
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1255
        assert self.base[-1] == '/'
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1256
        for l in _locs:
1257
            try:
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1258
                parent = self.control_files.get(l).read().strip('\n')
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
1259
            except NoSuchFile:
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1260
                continue
1261
            # This is an old-format absolute path to a local branch
1262
            # turn it into a url
1263
            if parent.startswith('/'):
1711.2.48 by John Arbash Meinel
fix a typo in bzrlib/branch
1264
                parent = urlutils.local_path_to_url(parent.decode('utf8'))
1864.7.1 by John Arbash Meinel
Let Branch.get_parent() return None if parent is not accessible, (bug #52976)
1265
            try:
1266
                return urlutils.join(self.base[:-1], parent)
1267
            except errors.InvalidURLJoin, e:
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
1268
                raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1269
        return None
1270
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1271
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1272
        """See Branch.get_push_location."""
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1273
        push_loc = self.get_config().get_user_option('push_location')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1274
        return push_loc
1275
1276
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1277
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1278
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1279
            'push_location', location,
1280
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1281
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1282
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1283
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1284
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1285
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1286
        # URLs should never be unicode, even on the local fs,
1287
        # FIXUP this and get_parent in a future branch format bump:
1288
        # read and rewrite the file, and have the new format code read
1289
        # using .get not .get_utf8. RBC 20060125
1614.2.5 by Olaf Conradi
Added testcase for bzr merge --remember.
1290
        if url is None:
1291
            self.control_files._transport.delete('parent')
1292
        else:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1293
            if isinstance(url, unicode):
1294
                try: 
1295
                    url = url.encode('ascii')
1296
                except UnicodeEncodeError:
1297
                    raise bzrlib.errors.InvalidURL(url,
1298
                        "Urls must be 7-bit ascii, "
1299
                        "use bzrlib.urlutils.escape")
1300
                    
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1301
            url = urlutils.relative_url(self.base, url)
1955.3.4 by John Arbash Meinel
Fix 2 calls to 'put()' that were using strings instead of files
1302
            self.control_files.put('parent', StringIO(url + '\n'))
1150 by Martin Pool
- add new Branch.set_parent and tests
1303
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1304
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1305
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1306
        """DEPRECATED; call get_config instead.  
1307
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1308
        return TreeConfig(self)
1309
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1310
1311
class BzrBranch5(BzrBranch):
1312
    """A format 5 branch. This supports new features over plan branches.
1313
1314
    It has support for a master_branch which is the data for bound branches.
1315
    """
1316
1317
    def __init__(self,
1318
                 _format,
1319
                 _control_files,
1320
                 a_bzrdir,
1321
                 _repository):
1322
        super(BzrBranch5, self).__init__(_format=_format,
1323
                                         _control_files=_control_files,
1324
                                         a_bzrdir=a_bzrdir,
1325
                                         _repository=_repository)
1326
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1327
    @needs_write_lock
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1328
    def pull(self, source, overwrite=False, stop_revision=None):
1329
        """Updates branch.pull to be bound branch aware."""
1330
        bound_location = self.get_bound_location()
1331
        if source.base != bound_location:
1332
            # not pulling from master, so we need to update master.
1333
            master_branch = self.get_master_branch()
1334
            if master_branch:
1335
                master_branch.pull(source)
1336
                source = master_branch
1337
        return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1338
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1339
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1340
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1341
            return self.control_files.get_utf8('bound').read()[:-1]
1342
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1343
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1344
1345
    @needs_read_lock
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1346
    def get_master_branch(self):
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1347
        """Return the branch we are bound to.
1348
        
1349
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1350
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1351
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1352
        it must be revalidated on each new lock.
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1353
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1354
        # RBC 20060304 review this decision.
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1355
        """
1356
        bound_loc = self.get_bound_location()
1357
        if not bound_loc:
1358
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1359
        try:
1360
            return Branch.open(bound_loc)
1361
        except (errors.NotBranchError, errors.ConnectionError), e:
1362
            raise errors.BoundBranchConnectionFailure(
1363
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1364
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1365
    @needs_write_lock
1366
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1367
        """Set the target where this branch is bound to.
1368
1369
        :param location: URL to the target branch
1370
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1371
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1372
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1373
        else:
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1374
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1375
                self.control_files._transport.delete('bound')
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1376
            except NoSuchFile:
1377
                return False
1378
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1379
1380
    @needs_write_lock
1381
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1382
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1383
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1384
        This does not push or pull data between the branches, though it does
1385
        check for divergence to raise an error when the branches are not
1386
        either the same, or one a prefix of the other. That behaviour may not
1387
        be useful, so that check may be removed in future.
1388
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1389
        :param other: The branch to bind to
1390
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1391
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1392
        # TODO: jam 20051230 Consider checking if the target is bound
1393
        #       It is debatable whether you should be able to bind to
1394
        #       a branch which is itself bound.
1395
        #       Committing is obviously forbidden,
1396
        #       but binding itself may not be.
1397
        #       Since we *have* to check at commit time, we don't
1398
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1399
1400
        # we want to raise diverged if:
1401
        # last_rev is not in the other_last_rev history, AND
1402
        # other_last_rev is not in our history, and do it without pulling
1403
        # history around
1404
        last_rev = self.last_revision()
1405
        if last_rev is not None:
1406
            other.lock_read()
1407
            try:
1408
                other_last_rev = other.last_revision()
1409
                if other_last_rev is not None:
1410
                    # neither branch is new, we have to do some work to
1411
                    # ascertain diversion.
1412
                    remote_graph = other.repository.get_revision_graph(
1413
                        other_last_rev)
1414
                    local_graph = self.repository.get_revision_graph(last_rev)
1415
                    if (last_rev not in remote_graph and
1416
                        other_last_rev not in local_graph):
1417
                        raise errors.DivergedBranches(self, other)
1418
            finally:
1419
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1420
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1421
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1422
    @needs_write_lock
1423
    def unbind(self):
1424
        """If bound, unbind"""
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1425
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1426
1587.1.10 by Robert Collins
update updates working tree and branch together.
1427
    @needs_write_lock
1428
    def update(self):
1429
        """Synchronise this branch with the master branch if any. 
1430
1431
        :return: None or the last_revision that was pivoted out during the
1432
                 update.
1433
        """
1434
        master = self.get_master_branch()
1435
        if master is not None:
1436
            old_tip = self.last_revision()
1437
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1438
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1439
                return None
1440
            return old_tip
1441
        return None
1442
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1443
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1444
class BranchTestProviderAdapter(object):
1445
    """A tool to generate a suite testing multiple branch formats at once.
1446
1447
    This is done by copying the test once for each transport and injecting
1448
    the transport_server, transport_readonly_server, and branch_format
1449
    classes into each copy. Each copy is also given a new id() to make it
1450
    easy to identify.
1451
    """
1452
1453
    def __init__(self, transport_server, transport_readonly_server, formats):
1454
        self._transport_server = transport_server
1455
        self._transport_readonly_server = transport_readonly_server
1456
        self._formats = formats
1457
    
1458
    def adapt(self, test):
1459
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1460
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1461
            new_test = deepcopy(test)
1462
            new_test.transport_server = self._transport_server
1463
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1464
            new_test.bzrdir_format = bzrdir_format
1465
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1466
            def make_new_test_id():
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1467
                new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1468
                return lambda: new_id
1469
            new_test.id = make_new_test_id()
1470
            result.addTest(new_test)
1471
        return result
1472
1473
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1474
class BranchCheckResult(object):
1475
    """Results of checking branch consistency.
1476
1477
    :see: Branch.check
1478
    """
1479
1480
    def __init__(self, branch):
1481
        self.branch = branch
1482
1483
    def report_results(self, verbose):
1484
        """Report the check results via trace.note.
1485
        
1486
        :param verbose: Requests more detailed display of what was checked,
1487
            if any.
1488
        """
1489
        note('checked branch %s format %s',
1490
             self.branch.base,
1491
             self.branch._format)
1492
1493
1 by mbp at sourcefrog
import from baz patch-364
1494
######################################################################
1495
# predicates
1496
1497
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1498
@deprecated_function(zero_eight)
1499
def is_control_file(*args, **kwargs):
1500
    """See bzrlib.workingtree.is_control_file."""
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1501
    from bzrlib import workingtree
1502
    return workingtree.is_control_file(*args, **kwargs)