~bzr-pqm/bzr/bzr.dev

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