/brz/remove-bazaar

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