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