/brz/remove-bazaar

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