/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.3 by Martin Pool
Add tag: revision namespace.
1
# Copyright (C) 2005, 2006, 2007 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
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
43
from bzrlib.tag import (
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
44
    BasicTags,
45
    DisabledTags,
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
46
    )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
47
""")
48
1534.4.28 by Robert Collins
first cut at merge from integration.
49
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
50
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
51
                           HistoryMissing, InvalidRevisionId,
52
                           InvalidRevisionNumber, LockError, NoSuchFile,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
53
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
54
                           NotBranchError, UninitializableFormat,
55
                           UnlistableStore, UnlistableBranch,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
56
                           )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
57
from bzrlib.symbol_versioning import (deprecated_function,
58
                                      deprecated_method,
59
                                      DEPRECATED_PARAMETER,
60
                                      deprecated_passed,
1770.2.12 by Aaron Bentley
Merge bzr.dev
61
                                      zero_eight, zero_nine,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
62
                                      )
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
63
from bzrlib.trace import mutter, note
1104 by Martin Pool
- Add a simple UIFactory
64
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
65
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
66
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
67
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
68
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
69
70
71
# TODO: Maybe include checks for common corruption of newlines, etc?
1 by mbp at sourcefrog
import from baz patch-364
72
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
73
# TODO: Some operations like log might retrieve the same revisions
74
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
75
# cache in memory to make this faster.  In general anything can be
1185.65.29 by Robert Collins
Implement final review suggestions.
76
# cached in memory between lock and unlock operations. .. nb thats
77
# what the transaction identity map provides
416 by Martin Pool
- bzr log and bzr root now accept an http URL
78
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
79
1 by mbp at sourcefrog
import from baz patch-364
80
######################################################################
81
# branch objects
82
558 by Martin Pool
- All top-level classes inherit from object
83
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
84
    """Branch holding a history of revisions.
85
343 by Martin Pool
doc
86
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
87
        Base directory/url of the branch.
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
88
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.
89
    hooks: An instance of BranchHooks.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
90
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
91
    # this is really an instance variable - FIXME move it there
92
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
93
    base = None
94
2220.2.10 by Martin Pool
(broken) start moving things to branches
95
    # override this to set the strategy for storing tags
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
96
    def _make_tags(self):
97
        return DisabledTags(self)
2220.2.10 by Martin Pool
(broken) start moving things to branches
98
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
99
    def __init__(self, *ignored, **ignored_too):
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
100
        self.tags = self._make_tags()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
101
        self._revision_history_cache = None
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
102
1687.1.8 by Robert Collins
Teach Branch about break_lock.
103
    def break_lock(self):
104
        """Break a lock if one is present from another instance.
105
106
        Uses the ui factory to ask for confirmation if the lock may be from
107
        an active process.
108
109
        This will probe the repository for its lock as well.
110
        """
111
        self.control_files.break_lock()
112
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
113
        master = self.get_master_branch()
114
        if master is not None:
115
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
116
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
117
    @staticmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
118
    @deprecated_method(zero_eight)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
119
    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.
120
        """Open a branch which may be of an old format."""
121
        return Branch.open(base, _unsupported=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
122
        
123
    @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.
124
    def open(base, _unsupported=False):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
125
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
126
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
127
        For instance, if the branch is at URL/.bzr/branch,
128
        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.
129
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
130
        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.
131
        return control.open_branch(_unsupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
132
133
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
134
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
135
        """Open an existing branch which contains url.
136
        
137
        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
138
139
        Basically we keep looking up until we find the control directory or
140
        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.
141
        If there is one and it is either an unrecognised format or an unsupported 
142
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
143
        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.
144
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
145
        control, relpath = bzrdir.BzrDir.open_containing(url)
146
        return control.open_branch(), relpath
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
147
148
    @staticmethod
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
149
    @deprecated_function(zero_eight)
150
    def initialize(base):
151
        """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
152
153
        NOTE: This will soon be deprecated in favour of creation
154
        through a BzrDir.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
155
        """
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.
156
        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.
157
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
158
    @deprecated_function(zero_eight)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
159
    def setup_caching(self, cache_root):
160
        """Subclasses that care about caching should override this, and set
161
        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
162
        
163
        NOTE: This is unused.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
164
        """
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
165
        pass
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
166
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
167
    def get_config(self):
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
168
        return BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
169
1185.35.11 by Aaron Bentley
Added support for branch nicks
170
    def _get_nick(self):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
171
        return self.get_config().get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
172
173
    def _set_nick(self, nick):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
174
        self.get_config().set_user_option('nickname', nick)
1185.35.11 by Aaron Bentley
Added support for branch nicks
175
176
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
177
178
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
179
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
180
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
181
    def lock_write(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
182
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
183
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
184
    def lock_read(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
185
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
186
187
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
188
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
189
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
190
    def peek_lock_mode(self):
191
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
192
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
193
1694.2.6 by Martin Pool
[merge] bzr.dev
194
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
195
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
196
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
197
    def abspath(self, name):
198
        """Return absolute filename for something in the branch
199
        
200
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
201
        method and not a tree method.
202
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
203
        raise NotImplementedError(self.abspath)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
204
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
205
    def bind(self, other):
206
        """Bind the local branch the other branch.
207
208
        :param other: The branch to bind to
209
        :type other: Branch
210
        """
211
        raise errors.UpgradeRequired(self.base)
212
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.
213
    @needs_write_lock
214
    def fetch(self, from_branch, last_revision=None, pb=None):
215
        """Copy revisions from from_branch into this branch.
216
217
        :param from_branch: Where to copy from.
218
        :param last_revision: What revision to stop at (None for at the end
219
                              of the branch.
220
        :param pb: An optional progress bar to use.
221
222
        Returns the copied revision count and the failed revisions in a tuple:
223
        (copied, failures).
224
        """
225
        if self.base == from_branch.base:
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
226
            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.
227
        if pb is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
228
            nested_pb = ui.ui_factory.nested_progress_bar()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
229
            pb = nested_pb
230
        else:
231
            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.
232
233
        from_branch.lock_read()
234
        try:
235
            if last_revision is None:
236
                pb.update('get source history')
2230.3.9 by Aaron Bentley
Fix most fetch tests
237
                last_revision = from_branch.last_revision()
238
                if last_revision is None:
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
239
                    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.
240
            return self.repository.fetch(from_branch.repository,
241
                                         revision_id=last_revision,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
242
                                         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.
243
        finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
244
            if nested_pb is not None:
245
                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.
246
            from_branch.unlock()
247
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
248
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
249
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
250
251
        Older format branches cannot bind, please be sure to use a metadir
252
        branch.
253
        """
254
        return None
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
255
    
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
256
    def get_old_bound_location(self):
257
        """Return the URL of the branch we used to be bound to
258
        """
259
        raise errors.UpgradeRequired(self.base)
260
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
261
    def get_commit_builder(self, parents, config=None, timestamp=None, 
262
                           timezone=None, committer=None, revprops=None, 
263
                           revision_id=None):
264
        """Obtain a CommitBuilder for this branch.
265
        
266
        :param parents: Revision ids of the parents of the new revision.
267
        :param config: Optional configuration to use.
268
        :param timestamp: Optional timestamp recorded for commit.
269
        :param timezone: Optional timezone for timestamp.
270
        :param committer: Optional committer to set for commit.
271
        :param revprops: Optional dictionary of revision properties.
272
        :param revision_id: Optional revision id.
273
        """
274
275
        if config is None:
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
276
            config = self.get_config()
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
277
        
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
278
        return self.repository.get_commit_builder(self, parents, config,
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
279
            timestamp, timezone, committer, revprops, revision_id)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
280
281
    def get_master_branch(self):
282
        """Return the branch we are bound to.
283
        
284
        :return: Either a Branch, or None
285
        """
286
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
287
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
288
    def get_revision_delta(self, revno):
289
        """Return the delta for one revision.
290
291
        The delta is relative to its mainline predecessor, or the
292
        empty tree for revision 1.
293
        """
294
        assert isinstance(revno, int)
295
        rh = self.revision_history()
296
        if not (1 <= revno <= len(rh)):
297
            raise InvalidRevisionNumber(revno)
298
        return self.repository.get_revision_delta(rh[revno-1])
299
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
300
    def get_root_id(self):
301
        """Return the id of this branches root"""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
302
        raise NotImplementedError(self.get_root_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
303
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
304
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
305
        """Print `file` to stdout."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
306
        raise NotImplementedError(self.print_file)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
307
308
    def append_revision(self, *revision_ids):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
309
        raise NotImplementedError(self.append_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
310
311
    def set_revision_history(self, rev_history):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
312
        raise NotImplementedError(self.set_revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
313
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
314
    def _cache_revision_history(self, rev_history):
315
        """Set the cached revision history to rev_history.
316
317
        The revision_history method will use this cache to avoid regenerating
318
        the revision history.
319
320
        This API is semi-public; it only for use by subclasses, all other code
321
        should consider it to be private.
322
        """
323
        self._revision_history_cache = rev_history
324
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
325
    def _clear_cached_state(self):
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
326
        """Clear any cached data on this branch, e.g. cached revision history.
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
327
328
        This means the next call to revision_history will need to call
329
        _gen_revision_history.
330
331
        This API is semi-public; it only for use by subclasses, all other code
332
        should consider it to be private.
333
        """
334
        self._revision_history_cache = None
335
336
    def _gen_revision_history(self):
337
        """Return sequence of revision hashes on to this branch.
338
        
339
        Unlike revision_history, this method always regenerates or rereads the
340
        revision history, i.e. it does not cache the result, so repeated calls
341
        may be expensive.
342
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
343
        Concrete subclasses should override this instead of revision_history so
344
        that subclasses do not need to deal with caching logic.
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
345
        
346
        This API is semi-public; it only for use by subclasses, all other code
347
        should consider it to be private.
348
        """
349
        raise NotImplementedError(self._gen_revision_history)
350
351
    @needs_read_lock
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
352
    def revision_history(self):
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
353
        """Return sequence of revision hashes on to this branch.
354
        
355
        This method will cache the revision history for as long as it is safe to
356
        do so.
357
        """
358
        if self._revision_history_cache is not None:
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
359
            history = self._revision_history_cache
360
        else:
361
            history = self._gen_revision_history()
362
            self._cache_revision_history(history)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
363
        return list(history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
364
365
    def revno(self):
366
        """Return current revision number for this branch.
367
368
        That is equivalent to the number of revisions committed to
369
        this branch.
370
        """
371
        return len(self.revision_history())
372
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
373
    def unbind(self):
374
        """Older format branches cannot bind or unbind."""
375
        raise errors.UpgradeRequired(self.base)
376
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
377
    def set_append_revisions_only(self, enabled):
378
        """Older format branches are never restricted to append-only"""
2230.3.32 by Aaron Bentley
Implement strict history policy
379
        raise errors.UpgradeRequired(self.base)
380
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
381
    def last_revision(self):
1819.1.7 by Martin Pool
Fix up code to get revision_id of bzr for benchmark log file
382
        """Return last revision id, or None"""
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
383
        ph = self.revision_history()
384
        if ph:
385
            return ph[-1]
386
        else:
387
            return None
388
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
389
    def last_revision_info(self):
390
        """Return information about the last revision.
391
392
        :return: A tuple (revno, last_revision_id).
393
        """
394
        rh = self.revision_history()
395
        revno = len(rh)
396
        if revno:
397
            return (revno, rh[-1])
398
        else:
399
            return (0, _mod_revision.NULL_REVISION)
400
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
401
    def missing_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
402
        """Return a list of new revisions that would perfectly fit.
403
        
404
        If self and other have not diverged, return a list of the revisions
405
        present in other, but missing from self.
406
        """
407
        self_history = self.revision_history()
408
        self_len = len(self_history)
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
409
        other_history = other.revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
410
        other_len = len(other_history)
411
        common_index = min(self_len, other_len) -1
412
        if common_index >= 0 and \
413
            self_history[common_index] != other_history[common_index]:
414
            raise DivergedBranches(self, other)
415
416
        if stop_revision is None:
417
            stop_revision = other_len
418
        else:
419
            assert isinstance(stop_revision, int)
420
            if stop_revision > other_len:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
421
                raise errors.NoSuchRevision(self, stop_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
422
        return other_history[self_len:stop_revision]
1185.66.1 by Aaron Bentley
Merged from mainline
423
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
424
    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
425
        """Pull in new perfect-fit revisions.
426
427
        :param other: Another Branch to pull from
428
        :param stop_revision: Updated until the given revision
429
        :return: None
430
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
431
        raise NotImplementedError(self.update_revisions)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
432
433
    def revision_id_to_revno(self, revision_id):
434
        """Given a revision id, return its revno"""
435
        if revision_id is None:
436
            return 0
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
437
        revision_id = osutils.safe_revision_id(revision_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
438
        history = self.revision_history()
439
        try:
440
            return history.index(revision_id) + 1
441
        except ValueError:
442
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
443
444
    def get_rev_id(self, revno, history=None):
445
        """Find the revision id of the specified revno."""
446
        if revno == 0:
447
            return None
448
        if history is None:
449
            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
450
        if revno <= 0 or revno > len(history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
451
            raise bzrlib.errors.NoSuchRevision(self, revno)
452
        return history[revno - 1]
453
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
454
    def pull(self, source, overwrite=False, stop_revision=None):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
455
        """Mirror source into this branch.
456
457
        This branch is considered to be 'local', having low latency.
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
458
459
        :returns: PullResult instance
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
460
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
461
        raise NotImplementedError(self.pull)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
462
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
463
    def push(self, target, overwrite=False, stop_revision=None):
464
        """Mirror this branch into target.
465
466
        This branch is considered to be 'local', having low latency.
467
        """
468
        raise NotImplementedError(self.push)
469
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
470
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
471
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
472
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
473
474
    def rename_one(self, from_rel, to_rel):
475
        """Rename one file.
476
477
        This can change the directory or the filename or both.
478
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
479
        raise NotImplementedError(self.rename_one)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
480
481
    def move(self, from_paths, to_name):
482
        """Rename files.
483
484
        to_name must exist as a versioned directory.
485
486
        If to_name exists and is a directory, the files are moved into
487
        it, keeping their old names.  If it is a directory, 
488
489
        Note that to_name is only the last component of the new name;
490
        this doesn't change the directory.
491
492
        This returns a list of (from_path, to_path) pairs for each
493
        entry that is moved.
494
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
495
        raise NotImplementedError(self.move)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
496
497
    def get_parent(self):
498
        """Return the parent location of the branch.
499
500
        This is the default location for push/pull/missing.  The usual
501
        pattern is that the user can override it by specifying a
502
        location.
503
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
504
        raise NotImplementedError(self.get_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
505
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
506
    def _set_config_location(self, name, url, config=None,
507
                             make_relative=False):
508
        if config is None:
509
            config = self.get_config()
510
        if url is None:
511
            url = ''
512
        elif make_relative:
513
            url = urlutils.relative_url(self.base, url)
514
        config.set_user_option(name, url)
515
516
    def _get_config_location(self, name, config=None):
517
        if config is None:
518
            config = self.get_config()
519
        location = config.get_user_option(name)
520
        if location == '':
521
            location = None
522
        return location
523
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
524
    def get_submit_branch(self):
525
        """Return the submit location of the branch.
526
527
        This is the default location for bundle.  The usual
528
        pattern is that the user can override it by specifying a
529
        location.
530
        """
531
        return self.get_config().get_user_option('submit_branch')
532
533
    def set_submit_branch(self, location):
534
        """Return the submit location of the branch.
535
536
        This is the default location for bundle.  The usual
537
        pattern is that the user can override it by specifying a
538
        location.
539
        """
540
        self.get_config().set_user_option('submit_branch', location)
541
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
542
    def get_public_branch(self):
543
        """Return the public location of the branch.
544
545
        This is is used by merge directives.
546
        """
547
        return self._get_config_location('public_branch')
548
549
    def set_public_branch(self, location):
550
        """Return the submit location of the branch.
551
552
        This is the default location for bundle.  The usual
553
        pattern is that the user can override it by specifying a
554
        location.
555
        """
556
        self._set_config_location('public_branch', location)
557
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
558
    def get_push_location(self):
559
        """Return the None or the location to push this branch to."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
560
        raise NotImplementedError(self.get_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
561
562
    def set_push_location(self, location):
563
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
564
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
565
566
    def set_parent(self, url):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
567
        raise NotImplementedError(self.set_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
568
1587.1.10 by Robert Collins
update updates working tree and branch together.
569
    @needs_write_lock
570
    def update(self):
571
        """Synchronise this branch with the master branch if any. 
572
573
        :return: None or the last_revision pivoted out during the update.
574
        """
575
        return None
576
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
577
    def check_revno(self, revno):
578
        """\
579
        Check whether a revno corresponds to any revision.
580
        Zero (the NULL revision) is considered valid.
581
        """
582
        if revno != 0:
583
            self.check_real_revno(revno)
584
            
585
    def check_real_revno(self, revno):
586
        """\
587
        Check whether a revno corresponds to a real revision.
588
        Zero (the NULL revision) is considered invalid
589
        """
590
        if revno < 1 or revno > self.revno():
591
            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.
592
593
    @needs_read_lock
594
    def clone(self, *args, **kwargs):
595
        """Clone this branch into to_bzrdir preserving all semantic values.
596
        
597
        revision_id: if not None, the revision history in the new branch will
598
                     be truncated to end with revision_id.
599
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
600
        # 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.
601
        # def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
602
        # after 0.8 releases, the *args and **kwargs should be changed:
603
        # def clone(self, to_bzrdir, revision_id=None):
604
        if (kwargs.get('to_location', None) or
605
            kwargs.get('revision', None) or
606
            kwargs.get('basis_branch', None) or
607
            (len(args) and isinstance(args[0], basestring))):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
608
            # 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.
609
            warn("Branch.clone() has been deprecated for BzrDir.clone() from"
610
                 " bzrlib 0.8.", DeprecationWarning, stacklevel=3)
611
            # get basis_branch
612
            if len(args) > 2:
613
                basis_branch = args[2]
614
            else:
615
                basis_branch = kwargs.get('basis_branch', None)
616
            if basis_branch:
617
                basis = basis_branch.bzrdir
618
            else:
619
                basis = None
620
            # get revision
621
            if len(args) > 1:
622
                revision_id = args[1]
623
            else:
624
                revision_id = kwargs.get('revision', None)
625
            # get location
626
            if len(args):
627
                url = args[0]
628
            else:
629
                # no default to raise if not provided.
630
                url = kwargs.get('to_location')
631
            return self.bzrdir.clone(url,
632
                                     revision_id=revision_id,
633
                                     basis=basis).open_branch()
634
        # new cleaner api.
635
        # generate args by hand 
636
        if len(args) > 1:
637
            revision_id = args[1]
638
        else:
639
            revision_id = kwargs.get('revision_id', None)
640
        if len(args):
641
            to_bzrdir = args[0]
642
        else:
643
            # no default to raise if not provided.
644
            to_bzrdir = kwargs.get('to_bzrdir')
645
        result = self._format.initialize(to_bzrdir)
646
        self.copy_content_into(result, revision_id=revision_id)
647
        return  result
648
649
    @needs_read_lock
650
    def sprout(self, to_bzrdir, revision_id=None):
651
        """Create a new line of development from the branch, into to_bzrdir.
652
        
653
        revision_id: if not None, the revision history in the new branch will
654
                     be truncated to end with revision_id.
655
        """
656
        result = self._format.initialize(to_bzrdir)
657
        self.copy_content_into(result, revision_id=revision_id)
658
        result.set_parent(self.bzrdir.root_transport.base)
659
        return result
660
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
661
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
662
        """Synchronize last revision and revision history between branches.
663
664
        This version is most efficient when the destination is also a
665
        BzrBranch5, but works for BzrBranch6 as long as the revision
666
        history is the true lefthand parent history, and all of the revisions
667
        are in the destination's repository.  If not, set_revision_history
668
        will fail.
669
670
        :param destination: The branch to copy the history into
671
        :param revision_id: The revision-id to truncate history at.  May
672
          be None to copy complete history.
673
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
674
        new_history = self.revision_history()
675
        if revision_id is not None:
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
676
            revision_id = osutils.safe_revision_id(revision_id)
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
677
            try:
678
                new_history = new_history[:new_history.index(revision_id) + 1]
679
            except ValueError:
680
                rev = self.repository.get_revision(revision_id)
681
                new_history = rev.get_history(self.repository)[1:]
682
        destination.set_revision_history(new_history)
683
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.
684
    @needs_read_lock
685
    def copy_content_into(self, destination, revision_id=None):
686
        """Copy the content of self into destination.
687
688
        revision_id: if not None, the revision history in the new branch will
689
                     be truncated to end with revision_id.
690
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
691
        self._synchronize_history(destination, revision_id)
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
692
        try:
693
            parent = self.get_parent()
694
        except errors.InaccessibleParent, e:
695
            mutter('parent was not accessible to copy: %s', e)
696
        else:
697
            if parent:
698
                destination.set_parent(parent)
2348.2.1 by Marien Zwart
Properly push tags if push creates a new branch.
699
        self.tags.merge_to(destination.tags)
1185.66.1 by Aaron Bentley
Merged from mainline
700
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
701
    @needs_read_lock
702
    def check(self):
703
        """Check consistency of the branch.
704
705
        In particular this checks that revisions given in the revision-history
706
        do actually match up in the revision graph, and that they're all 
707
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
708
        
709
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
710
711
        :return: A BranchCheckResult.
712
        """
713
        mainline_parent_id = None
714
        for revision_id in self.revision_history():
715
            try:
716
                revision = self.repository.get_revision(revision_id)
717
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
718
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
719
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
720
            # In general the first entry on the revision history has no parents.
721
            # But it's not illegal for it to have parents listed; this can happen
722
            # in imports from Arch when the parents weren't reachable.
723
            if mainline_parent_id is not None:
724
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
725
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
726
                                        "parents of {%s}"
727
                                        % (mainline_parent_id, revision_id))
728
            mainline_parent_id = revision_id
729
        return BranchCheckResult(self)
730
1910.2.39 by Aaron Bentley
Fix checkout bug
731
    def _get_checkout_format(self):
732
        """Return the most suitable metadir for a checkout of this branch.
733
        Weaves are used if this branch's repostory uses weaves.
734
        """
735
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
736
            from bzrlib.repofmt import weaverepo
1910.2.39 by Aaron Bentley
Fix checkout bug
737
            format = bzrdir.BzrDirMetaFormat1()
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
738
            format.repository_format = weaverepo.RepositoryFormat7()
1910.2.39 by Aaron Bentley
Fix checkout bug
739
        else:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
740
            format = self.repository.bzrdir.checkout_metadir()
2370.3.2 by John Arbash Meinel
Use BzrDir.set_branch_format() rather than setting it directly.
741
            format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
742
        return format
743
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
744
    def create_checkout(self, to_location, revision_id=None,
1551.8.5 by Aaron Bentley
Change name to create_checkout
745
                        lightweight=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
746
        """Create a checkout of a branch.
747
        
748
        :param to_location: The url to produce the checkout at
749
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
750
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
751
        produce a bound branch (heavyweight checkout)
752
        :return: The tree of the created checkout
753
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
754
        t = transport.get_transport(to_location)
755
        try:
756
            t.mkdir('.')
757
        except errors.FileExists:
758
            pass
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
759
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
760
            format = self._get_checkout_format()
761
            checkout = format.initialize_on_transport(t)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
762
            BranchReferenceFormat().initialize(checkout, self)
763
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
764
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
765
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
766
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
767
            checkout = checkout_branch.bzrdir
768
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
769
            # pull up to the specified revision_id to set the initial 
770
            # branch tip correctly, and seed it with history.
771
            checkout_branch.pull(self, stop_revision=revision_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
772
        tree = checkout.create_workingtree(revision_id)
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
773
        basis_tree = tree.basis_tree()
774
        basis_tree.lock_read()
775
        try:
776
            for path, file_id in basis_tree.iter_references():
777
                reference_parent = self.reference_parent(file_id, path)
778
                reference_parent.create_checkout(tree.abspath(path),
779
                    basis_tree.get_reference_revision(file_id, path),
780
                    lightweight)
781
        finally:
782
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
783
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
784
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
785
    def reference_parent(self, file_id, path):
2100.3.29 by Aaron Bentley
Get merge working initially
786
        """Return the parent branch for a tree-reference file_id
787
        :param file_id: The file_id of the tree reference
788
        :param path: The path of the file_id in the tree
789
        :return: A branch associated with the file_id
790
        """
791
        # FIXME should provide multiple branches, based on config
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
792
        return Branch.open(self.bzrdir.root_transport.clone(path).base)
793
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
794
    def supports_tags(self):
795
        return self._format.supports_tags()
796
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
797
798
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
799
    """An encapsulation of the initialization and open routines for a format.
800
801
    Formats provide three things:
802
     * An initialization routine,
803
     * a format string,
804
     * an open routine.
805
806
    Formats are placed in an dict by their format string for reference 
807
    during branch opening. Its not required that these be instances, they
808
    can be classes themselves with class methods - it simply depends on 
809
    whether state is needed for a given format or not.
810
811
    Once a format is deprecated, just deprecate the initialize and open
812
    methods on the format class. Do not deprecate the object, as the 
813
    object will be created every time regardless.
814
    """
815
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
816
    _default_format = None
817
    """The default format used for new branches."""
818
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
819
    _formats = {}
820
    """The known formats."""
821
822
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
823
    def find_format(klass, a_bzrdir):
824
        """Return the format for the branch object in a_bzrdir."""
825
        try:
826
            transport = a_bzrdir.get_branch_transport(None)
827
            format_string = transport.get("format").read()
828
            return klass._formats[format_string]
829
        except NoSuchFile:
830
            raise NotBranchError(path=transport.base)
831
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
832
            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.
833
834
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
835
    def get_default_format(klass):
836
        """Return the current default format."""
837
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
838
839
    def get_format_string(self):
840
        """Return the ASCII format string that identifies this format."""
841
        raise NotImplementedError(self.get_format_string)
842
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
843
    def get_format_description(self):
844
        """Return the short format description for this format."""
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
845
        raise NotImplementedError(self.get_format_description)
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
846
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
847
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
848
                           set_format=True):
849
        """Initialize a branch in a bzrdir, with specified files
850
851
        :param a_bzrdir: The bzrdir to initialize the branch in
852
        :param utf8_files: The files to create as a list of
853
            (filename, content) tuples
854
        :param set_format: If True, set the format with
855
            self.get_format_string.  (BzrBranch4 has its format set
856
            elsewhere)
857
        :return: a branch in this format
858
        """
859
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
860
        branch_transport = a_bzrdir.get_branch_transport(self)
861
        lock_map = {
862
            'metadir': ('lock', lockdir.LockDir),
863
            'branch4': ('branch-lock', lockable_files.TransportLock),
864
        }
865
        lock_name, lock_class = lock_map[lock_type]
866
        control_files = lockable_files.LockableFiles(branch_transport,
867
            lock_name, lock_class)
868
        control_files.create_lock()
869
        control_files.lock_write()
870
        if set_format:
871
            control_files.put_utf8('format', self.get_format_string())
872
        try:
873
            for file, content in utf8_files:
874
                control_files.put_utf8(file, content)
875
        finally:
876
            control_files.unlock()
877
        return self.open(a_bzrdir, _found=True)
878
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
879
    def initialize(self, a_bzrdir):
880
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
881
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
882
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.
883
    def is_supported(self):
884
        """Is this format supported?
885
886
        Supported formats can be initialized and opened.
887
        Unsupported formats may not support initialization or committing or 
888
        some other features depending on the reason for not being supported.
889
        """
890
        return True
891
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
892
    def open(self, a_bzrdir, _found=False):
893
        """Return the branch object for a_bzrdir
894
895
        _found is a private parameter, do not use it. It is used to indicate
896
               if format probing has already be done.
897
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
898
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
899
900
    @classmethod
901
    def register_format(klass, format):
902
        klass._formats[format.get_format_string()] = format
903
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.
904
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
905
    def set_default_format(klass, format):
906
        klass._default_format = format
907
908
    @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.
909
    def unregister_format(klass, format):
910
        assert klass._formats[format.get_format_string()] is format
911
        del klass._formats[format.get_format_string()]
912
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
913
    def __str__(self):
914
        return self.get_format_string().rstrip()
915
2220.2.10 by Martin Pool
(broken) start moving things to branches
916
    def supports_tags(self):
917
        """True if this format supports tags stored in the branch"""
918
        return False  # by default
919
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
920
    # XXX: Probably doesn't really belong here -- mbp 20070212
2220.2.10 by Martin Pool
(broken) start moving things to branches
921
    def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
922
            lock_class):
923
        branch_transport = a_bzrdir.get_branch_transport(self)
924
        control_files = lockable_files.LockableFiles(branch_transport,
925
            lock_filename, lock_class)
926
        control_files.create_lock()
927
        control_files.lock_write()
928
        try:
929
            for filename, content in utf8_files:
930
                control_files.put_utf8(filename, content)
931
        finally:
932
            control_files.unlock()
933
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
934
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
935
class BranchHooks(dict):
936
    """A dictionary mapping hook name to a list of callables for branch hooks.
937
    
938
    e.g. ['set_rh'] Is the list of items to be called when the
939
    set_revision_history function is invoked.
940
    """
941
942
    def __init__(self):
943
        """Create the default hooks.
944
945
        These are all empty initially, because by default nothing should get
946
        notified.
947
        """
948
        dict.__init__(self)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
949
        # Introduced in 0.15:
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
950
        # invoked whenever the revision history has been set
951
        # with set_revision_history. The api signature is
952
        # (branch, revision_history), and the branch will
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
953
        # be write-locked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
954
        self['set_rh'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
955
        # invoked after a push operation completes.
956
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
957
        # (push_result)
958
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
959
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
960
        # where local is the local branch or None, master is the target 
961
        # master branch, and the rest should be self explanatory. The source
962
        # is read locked and the target branches write locked. Source will
963
        # be the local low-latency branch.
964
        self['post_push'] = []
965
        # invoked after a pull operation completes.
966
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
967
        # (pull_result)
968
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
969
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
970
        # where local is the local branch or None, master is the target 
971
        # master branch, and the rest should be self explanatory. The source
972
        # is read locked and the target branches write locked. The local
973
        # branch is the low-latency branch.
974
        self['post_pull'] = []
975
        # invoked after a commit operation completes.
976
        # the api signature is 
977
        # (local, master, old_revno, old_revid, new_revno, new_revid)
978
        # old_revid is NULL_REVISION for the first commit to a branch.
979
        self['post_commit'] = []
980
        # invoked after a uncommit operation completes.
981
        # the api signature is
982
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
983
        # local is the local branch or None, master is the target branch,
984
        # and an empty branch recieves new_revno of 0, new_revid of None.
985
        self['post_uncommit'] = []
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
986
987
    def install_hook(self, hook_name, a_callable):
988
        """Install a_callable in to the hook hook_name.
989
990
        :param hook_name: A hook name. See the __init__ method of BranchHooks
991
            for the complete list of hooks.
992
        :param a_callable: The callable to be invoked when the hook triggers.
993
            The exact signature will depend on the hook - see the __init__ 
994
            method of BranchHooks for details on each hook.
995
        """
996
        try:
997
            self[hook_name].append(a_callable)
998
        except KeyError:
999
            raise errors.UnknownHook('branch', hook_name)
1000
1001
1002
# install the default hooks into the Branch class.
1003
Branch.hooks = BranchHooks()
1004
1005
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1006
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1007
    """Bzr branch format 4.
1008
1009
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1010
     - 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.
1011
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1012
    """
1013
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1014
    def get_format_description(self):
1015
        """See BranchFormat.get_format_description()."""
1016
        return "Branch format 4"
1017
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1018
    def initialize(self, a_bzrdir):
1019
        """Create a branch of this format in a_bzrdir."""
1020
        utf8_files = [('revision-history', ''),
1021
                      ('branch-name', ''),
1022
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1023
        return self._initialize_helper(a_bzrdir, utf8_files,
1024
                                       lock_type='branch4', set_format=False)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1025
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1026
    def __init__(self):
1027
        super(BzrBranchFormat4, self).__init__()
1028
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1029
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1030
    def open(self, a_bzrdir, _found=False):
1031
        """Return the branch object for a_bzrdir
1032
1033
        _found is a private parameter, do not use it. It is used to indicate
1034
               if format probing has already be done.
1035
        """
1036
        if not _found:
1037
            # we are being called directly and must probe.
1038
            raise NotImplementedError
1039
        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.
1040
                         _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.
1041
                         a_bzrdir=a_bzrdir,
1042
                         _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.
1043
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1044
    def __str__(self):
1045
        return "Bazaar-NG branch format 4"
1046
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1047
1048
class BzrBranchFormat5(BranchFormat):
1049
    """Bzr branch format 5.
1050
1051
    This format has:
1052
     - a revision-history file.
1053
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1054
     - a lock dir guarding the branch itself
1055
     - 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.
1056
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1057
1058
    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.
1059
    """
1060
1061
    def get_format_string(self):
1062
        """See BranchFormat.get_format_string()."""
1063
        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
1064
1065
    def get_format_description(self):
1066
        """See BranchFormat.get_format_description()."""
1067
        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.
1068
        
1069
    def initialize(self, a_bzrdir):
1070
        """Create a branch of this format in a_bzrdir."""
1071
        utf8_files = [('revision-history', ''),
1072
                      ('branch-name', ''),
1073
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1074
        return self._initialize_helper(a_bzrdir, utf8_files)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1075
1076
    def __init__(self):
1077
        super(BzrBranchFormat5, self).__init__()
1078
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1079
1080
    def open(self, a_bzrdir, _found=False):
1081
        """Return the branch object for a_bzrdir
1082
1083
        _found is a private parameter, do not use it. It is used to indicate
1084
               if format probing has already be done.
1085
        """
1086
        if not _found:
1087
            format = BranchFormat.find_format(a_bzrdir)
1088
            assert format.__class__ == self.__class__
1089
        transport = a_bzrdir.get_branch_transport(None)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1090
        control_files = lockable_files.LockableFiles(transport, 'lock',
1091
                                                     lockdir.LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1092
        return BzrBranch5(_format=self,
1093
                          _control_files=control_files,
1094
                          a_bzrdir=a_bzrdir,
1095
                          _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.
1096
2220.2.10 by Martin Pool
(broken) start moving things to branches
1097
2230.3.1 by Aaron Bentley
Get branch6 creation working
1098
class BzrBranchFormat6(BzrBranchFormat5):
1099
    """Branch format with last-revision
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1100
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1101
    Unlike previous formats, this has no explicit revision history. Instead,
1102
    this just stores the last-revision, and the left-hand history leading
1103
    up to there is the history.
1104
1105
    This format was introduced in bzr 0.15
2230.3.1 by Aaron Bentley
Get branch6 creation working
1106
    """
1107
1108
    def get_format_string(self):
1109
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1110
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
1111
1112
    def get_format_description(self):
1113
        """See BranchFormat.get_format_description()."""
1114
        return "Branch format 6"
1115
1116
    def initialize(self, a_bzrdir):
1117
        """Create a branch of this format in a_bzrdir."""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1118
        utf8_files = [('last-revision', '0 null:\n'),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1119
                      ('branch-name', ''),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1120
                      ('branch.conf', ''),
1121
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1122
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1123
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1124
1125
    def open(self, a_bzrdir, _found=False):
1126
        """Return the branch object for a_bzrdir
1127
1128
        _found is a private parameter, do not use it. It is used to indicate
1129
               if format probing has already be done.
1130
        """
1131
        if not _found:
1132
            format = BranchFormat.find_format(a_bzrdir)
1133
            assert format.__class__ == self.__class__
1134
        transport = a_bzrdir.get_branch_transport(None)
1135
        control_files = lockable_files.LockableFiles(transport, 'lock',
1136
                                                     lockdir.LockDir)
1137
        return BzrBranch6(_format=self,
1138
                          _control_files=control_files,
1139
                          a_bzrdir=a_bzrdir,
1140
                          _repository=a_bzrdir.find_repository())
1141
2220.2.27 by Martin Pool
Start adding tags to Branch6
1142
    def supports_tags(self):
1143
        return True
1144
2230.3.1 by Aaron Bentley
Get branch6 creation working
1145
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.
1146
class BranchReferenceFormat(BranchFormat):
1147
    """Bzr branch reference format.
1148
1149
    Branch references are used in implementing checkouts, they
1150
    act as an alias to the real branch which is at some other url.
1151
1152
    This format has:
1153
     - A location file
1154
     - a format string
1155
    """
1156
1157
    def get_format_string(self):
1158
        """See BranchFormat.get_format_string()."""
1159
        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
1160
1161
    def get_format_description(self):
1162
        """See BranchFormat.get_format_description()."""
1163
        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.
1164
        
1165
    def initialize(self, a_bzrdir, target_branch=None):
1166
        """Create a branch of this format in a_bzrdir."""
1167
        if target_branch is None:
1168
            # this format does not implement branch itself, thus the implicit
1169
            # creation contract must see it as uninitializable
1170
            raise errors.UninitializableFormat(self)
1171
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1172
        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
1173
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1174
            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
1175
        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.
1176
        return self.open(a_bzrdir, _found=True)
1177
1178
    def __init__(self):
1179
        super(BranchReferenceFormat, self).__init__()
1180
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1181
1182
    def _make_reference_clone_function(format, a_branch):
1183
        """Create a clone() routine for a branch dynamically."""
1184
        def clone(to_bzrdir, revision_id=None):
1185
            """See Branch.clone()."""
1186
            return format.initialize(to_bzrdir, a_branch)
1187
            # cannot obey revision_id limits when cloning a reference ...
1188
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1189
            # emit some sort of warning/error to the caller ?!
1190
        return clone
1191
1192
    def open(self, a_bzrdir, _found=False):
1193
        """Return the branch that the branch reference in a_bzrdir points at.
1194
1195
        _found is a private parameter, do not use it. It is used to indicate
1196
               if format probing has already be done.
1197
        """
1198
        if not _found:
1199
            format = BranchFormat.find_format(a_bzrdir)
1200
            assert format.__class__ == self.__class__
1201
        transport = a_bzrdir.get_branch_transport(None)
1202
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
1203
        result = real_bzrdir.open_branch()
1204
        # this changes the behaviour of result.clone to create a new reference
1205
        # rather than a copy of the content of the branch.
1206
        # I did not use a proxy object because that needs much more extensive
1207
        # testing, and we are only changing one behaviour at the moment.
1208
        # If we decide to alter more behaviours - i.e. the implicit nickname
1209
        # then this should be refactored to introduce a tested proxy branch
1210
        # and a subclass of that for use in overriding clone() and ....
1211
        # - RBC 20060210
1212
        result.clone = self._make_reference_clone_function(result)
1213
        return result
1214
1215
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1216
# formats which have no format string are not discoverable
1217
# 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.
1218
__default_format = BzrBranchFormat5()
1219
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.
1220
BranchFormat.register_format(BranchReferenceFormat())
2230.3.1 by Aaron Bentley
Get branch6 creation working
1221
BranchFormat.register_format(BzrBranchFormat6())
2230.3.28 by Aaron Bentley
Restore default formats
1222
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1223
_legacy_formats = [BzrBranchFormat4(),
1224
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1225
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1226
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1227
    """A branch stored in the actual filesystem.
1228
1229
    Note that it's "local" in the context of the filesystem; it doesn't
1230
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1231
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
1232
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1233
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1234
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
1235
                 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.
1236
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
1237
        """Create new branch object at a particular location.
1238
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1239
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1240
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
1241
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
1242
             unversioned directory.  If False, the branch must already
1243
             be versioned.
1244
1293 by Martin Pool
- add Branch constructor option to relax version check
1245
        relax_version_check -- If true, the usual check for the branch
1246
            version is not applied.  This is intended only for
1247
            upgrade/recovery type use; it's not guaranteed that
1248
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
1249
        """
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
1250
        Branch.__init__(self)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1251
        if a_bzrdir is None:
1252
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
1253
        else:
1254
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1255
        # self._transport used to point to the directory containing the
1256
        # control directory, but was not used - now it's just the transport
1257
        # for the branch control files.  mbp 20070212
1258
        self._base = self.bzrdir.transport.clone('..').base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1259
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1260
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1261
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1262
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1263
        self._transport = _control_files._transport
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1264
        if deprecated_passed(init):
1265
            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.
1266
                 "deprecated as of bzr 0.8. Please use Branch.create().",
1267
                 DeprecationWarning,
1268
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1269
            if init:
1270
                # this is slower than before deprecation, oh well never mind.
1271
                # -> its deprecated.
1272
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
1273
        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.
1274
        if deprecated_passed(relax_version_check):
1275
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1276
                 "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.
1277
                 "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.
1278
                 "open() method.",
1279
                 DeprecationWarning,
1280
                 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.
1281
            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.
1282
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
1283
                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.
1284
        if deprecated_passed(transport):
1285
            warn("BzrBranch.__init__(transport=XXX...): The transport "
1286
                 "parameter is deprecated as of bzr 0.8. "
1287
                 "Please use Branch.open, or bzrdir.open_branch().",
1288
                 DeprecationWarning,
1289
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1290
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1291
1 by mbp at sourcefrog
import from baz patch-364
1292
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1293
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1294
1295
    __repr__ = __str__
1296
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1297
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1298
        """Returns the directory containing the control directory."""
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
1299
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1300
1442.1.5 by Robert Collins
Give branch.base a docstring.
1301
    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,
1302
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1303
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1304
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1305
        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.
1306
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.
1307
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
1308
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
1309
1534.4.8 by Robert Collins
Unfuck upgrade.
1310
        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.
1311
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
1312
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1313
        The format parameter is either None or the branch format class
1314
        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.
1315
1316
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
1317
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1318
        if format is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1319
            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.
1320
        self._format = format
1321
        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.
1322
1508.1.15 by Robert Collins
Merge from mpool.
1323
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1324
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1325
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1326
        tree = self.repository.revision_tree(self.last_revision())
1327
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1328
1694.2.6 by Martin Pool
[merge] bzr.dev
1329
    def is_locked(self):
1330
        return self.control_files.is_locked()
1331
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1332
    def lock_write(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1333
        self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1334
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1335
            self.control_files.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1336
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1337
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1338
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1339
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1340
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1341
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1342
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1343
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1344
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1345
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1346
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1347
1348
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1349
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1350
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1351
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1352
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1353
            self.repository.unlock()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1354
        if not self.control_files.is_locked():
1355
            # we just released the lock
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1356
            self._clear_cached_state()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1357
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1358
    def peek_lock_mode(self):
1359
        if self.control_files._lock_count == 0:
1360
            return None
1361
        else:
1362
            return self.control_files._lock_mode
1363
1694.2.6 by Martin Pool
[merge] bzr.dev
1364
    def get_physical_lock_status(self):
1365
        return self.control_files.get_physical_lock_status()
1366
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1367
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1368
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1369
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1370
        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.
1371
1372
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1373
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1374
        """See Branch.append_revision."""
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1375
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
905 by Martin Pool
- merge aaron's append_multiple.patch
1376
        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
1377
            _mod_revision.check_not_reserved_id(revision_id)
905 by Martin Pool
- merge aaron's append_multiple.patch
1378
            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.
1379
        rev_history = self.revision_history()
1380
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1381
        self.set_revision_history(rev_history)
1382
2230.3.49 by Aaron Bentley
Fix cache updating
1383
    def _write_revision_history(self, history):
1384
        """Factored out of set_revision_history.
1385
1386
        This performs the actual writing to disk.
1387
        It is intended to be called by BzrBranch5.set_revision_history."""
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1388
        self.control_files.put_bytes(
2230.3.49 by Aaron Bentley
Fix cache updating
1389
            'revision-history', '\n'.join(history))
1390
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1391
    @needs_write_lock
1392
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1393
        """See Branch.set_revision_history."""
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1394
        rev_history = [osutils.safe_revision_id(r) for r in rev_history]
2230.3.49 by Aaron Bentley
Fix cache updating
1395
        self._write_revision_history(rev_history)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1396
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1397
        for hook in Branch.hooks['set_rh']:
1398
            hook(self, rev_history)
233 by mbp at sourcefrog
- more output from test.sh
1399
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1400
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1401
    def set_last_revision_info(self, revno, revision_id):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1402
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1403
        history = self._lefthand_history(revision_id)
1404
        assert len(history) == revno, '%d != %d' % (len(history), revno)
1405
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1406
2230.4.1 by Aaron Bentley
Get log as fast branch5
1407
    def _gen_revision_history(self):
2309.4.11 by John Arbash Meinel
Change Branch5._gen_revision_history() to be a bit faster about reading all revisions.
1408
        history = self.control_files.get('revision-history').read().split('\n')
1409
        if history[-1:] == ['']:
1410
            # There shouldn't be a trailing newline, but just in case.
1411
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
1412
        return history
1413
2230.3.2 by Aaron Bentley
Get all branch tests passing
1414
    def _lefthand_history(self, revision_id, last_rev=None,
1415
                          other_branch=None):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1416
        # stop_revision must be a descendant of last_revision
1417
        stop_graph = self.repository.get_revision_graph(revision_id)
1418
        if last_rev is not None and last_rev not in stop_graph:
1419
            # our previous tip is not merged into stop_revision
1420
            raise errors.DivergedBranches(self, other_branch)
1421
        # make a new revision history from the graph
1422
        current_rev_id = revision_id
1423
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1424
        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.
1425
            new_history.append(current_rev_id)
1426
            current_rev_id_parents = stop_graph[current_rev_id]
1427
            try:
1428
                current_rev_id = current_rev_id_parents[0]
1429
            except IndexError:
1430
                current_rev_id = None
1431
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1432
        return new_history
1433
1434
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1435
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1436
        other_branch=None):
1437
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1438
2230.3.2 by Aaron Bentley
Get all branch tests passing
1439
        :param revision_id: the new tip to use.
1440
        :param last_rev: The previous last_revision. If not None, then this
1441
            must be a ancestory of revision_id, or DivergedBranches is raised.
1442
        :param other_branch: The other branch that DivergedBranches should
1443
            raise with respect to.
1444
        """
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1445
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1446
        self.set_revision_history(self._lefthand_history(revision_id,
1447
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1448
1449
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1450
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1451
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1452
        other.lock_read()
1453
        try:
1454
            if stop_revision is None:
1455
                stop_revision = other.last_revision()
1456
                if stop_revision is None:
1457
                    # if there are no commits, we're done.
1458
                    return
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1459
            else:
1460
                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
1461
            # whats the current last revision, before we fetch [and change it
1462
            # possibly]
1463
            last_rev = self.last_revision()
1464
            # we fetch here regardless of whether we need to so that we pickup
1465
            # filled in ghosts.
1466
            self.fetch(other, stop_revision)
1467
            my_ancestry = self.repository.get_ancestry(last_rev)
1468
            if stop_revision in my_ancestry:
1469
                # last_revision is a descendant of stop_revision
1470
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1471
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1472
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1473
        finally:
1474
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1475
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1476
    def basis_tree(self):
1477
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1478
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1479
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1480
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1481
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1482
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1483
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1484
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1485
        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.
1486
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1487
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1488
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1489
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1490
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1491
    def pull(self, source, overwrite=False, stop_revision=None,
1492
        _hook_master=None, _run_hooks=True):
1493
        """See Branch.pull.
1494
1495
        :param _hook_master: Private parameter - set the branch to 
1496
            be supplied as the master to push hooks.
1497
        :param _run_hooks: Private parameter - allow disabling of
1498
            hooks, used when pushing to a master branch.
1499
        """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1500
        result = PullResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1501
        result.source_branch = source
1502
        result.target_branch = self
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1503
        source.lock_read()
1504
        try:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1505
            result.old_revno, result.old_revid = self.last_revision_info()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1506
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1507
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1508
            except DivergedBranches:
1509
                if not overwrite:
1510
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1511
            if overwrite:
1551.10.22 by Aaron Bentley
Fix pull --overwrite for bundles
1512
                if stop_revision is None:
1513
                    stop_revision = source.last_revision()
1514
                self.generate_revision_history(stop_revision)
2220.2.36 by Martin Pool
Push and pull operations now merge tags and report conflicts in their result
1515
            result.tag_conflicts = source.tags.merge_to(self.tags)
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1516
            result.new_revno, result.new_revid = self.last_revision_info()
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1517
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1518
                result.master_branch = _hook_master
1519
                result.local_branch = self
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1520
            else:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1521
                result.master_branch = self
1522
                result.local_branch = None
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1523
            if _run_hooks:
1524
                for hook in Branch.hooks['post_pull']:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1525
                    hook(result)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1526
        finally:
1527
            source.unlock()
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1528
        return result
1 by mbp at sourcefrog
import from baz patch-364
1529
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1530
    def _get_parent_location(self):
1531
        _locs = ['parent', 'pull', 'x-pull']
1532
        for l in _locs:
1533
            try:
1534
                return self.control_files.get(l).read().strip('\n')
1535
            except NoSuchFile:
1536
                pass
1537
        return None
1538
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1539
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1540
    def push(self, target, overwrite=False, stop_revision=None,
1541
        _hook_master=None, _run_hooks=True):
1542
        """See Branch.push.
1543
        
1544
        :param _hook_master: Private parameter - set the branch to 
1545
            be supplied as the master to push hooks.
1546
        :param _run_hooks: Private parameter - allow disabling of
1547
            hooks, used when pushing to a master branch.
1548
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1549
        result = PushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1550
        result.source_branch = self
1551
        result.target_branch = target
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1552
        target.lock_write()
1553
        try:
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1554
            result.old_revno, result.old_revid = target.last_revision_info()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1555
            try:
1556
                target.update_revisions(self, stop_revision)
1557
            except DivergedBranches:
1558
                if not overwrite:
1559
                    raise
1560
            if overwrite:
1561
                target.set_revision_history(self.revision_history())
2220.2.36 by Martin Pool
Push and pull operations now merge tags and report conflicts in their result
1562
            result.tag_conflicts = self.tags.merge_to(target.tags)
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1563
            result.new_revno, result.new_revid = target.last_revision_info()
1564
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1565
                result.master_branch = _hook_master
1566
                result.local_branch = target
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1567
            else:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1568
                result.master_branch = target
1569
                result.local_branch = None
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1570
            if _run_hooks:
1571
                for hook in Branch.hooks['post_push']:
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1572
                    hook(result)
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1573
        finally:
1574
            target.unlock()
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1575
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1576
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1577
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1578
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1579
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1580
        assert self.base[-1] == '/'
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1581
        parent = self._get_parent_location()
1582
        if parent is None:
1583
            return parent
1584
        # This is an old-format absolute path to a local branch
1585
        # turn it into a url
1586
        if parent.startswith('/'):
1587
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1588
        try:
1589
            return urlutils.join(self.base[:-1], parent)
1590
        except errors.InvalidURLJoin, e:
1591
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1592
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1593
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1594
        """See Branch.get_push_location."""
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1595
        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.
1596
        return push_loc
1597
1598
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1599
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1600
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1601
            'push_location', location,
1602
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1603
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1604
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1605
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1606
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1607
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1608
        # URLs should never be unicode, even on the local fs,
1609
        # FIXUP this and get_parent in a future branch format bump:
1610
        # read and rewrite the file, and have the new format code read
1611
        # using .get not .get_utf8. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1612
        if url is not None:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1613
            if isinstance(url, unicode):
1614
                try: 
1615
                    url = url.encode('ascii')
1616
                except UnicodeEncodeError:
1617
                    raise bzrlib.errors.InvalidURL(url,
1618
                        "Urls must be 7-bit ascii, "
1619
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1620
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1621
        self._set_parent_location(url)
1622
1623
    def _set_parent_location(self, url):
1624
        if url is None:
1625
            self.control_files._transport.delete('parent')
1626
        else:
1627
            assert isinstance(url, str)
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1628
            self.control_files.put_bytes('parent', url + '\n')
1150 by Martin Pool
- add new Branch.set_parent and tests
1629
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1630
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1631
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1632
        """DEPRECATED; call get_config instead.  
1633
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1634
        return TreeConfig(self)
1635
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1636
1637
class BzrBranch5(BzrBranch):
1638
    """A format 5 branch. This supports new features over plan branches.
1639
1640
    It has support for a master_branch which is the data for bound branches.
1641
    """
1642
1643
    def __init__(self,
1644
                 _format,
1645
                 _control_files,
1646
                 a_bzrdir,
1647
                 _repository):
1648
        super(BzrBranch5, self).__init__(_format=_format,
1649
                                         _control_files=_control_files,
1650
                                         a_bzrdir=a_bzrdir,
1651
                                         _repository=_repository)
1652
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1653
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1654
    def pull(self, source, overwrite=False, stop_revision=None,
1655
        _run_hooks=True):
1656
        """Extends branch.pull to be bound branch aware.
1657
        
1658
        :param _run_hooks: Private parameter used to force hook running
1659
            off during bound branch double-pushing.
1660
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1661
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1662
        master_branch = None
1663
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1664
            # not pulling from master, so we need to update master.
1665
            master_branch = self.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1666
            master_branch.lock_write()
1667
        try:
1668
            if master_branch:
1669
                # pull from source into master.
1670
                master_branch.pull(source, overwrite, stop_revision,
1671
                    _run_hooks=False)
1672
            return super(BzrBranch5, self).pull(source, overwrite,
1673
                stop_revision, _hook_master=master_branch,
1674
                _run_hooks=_run_hooks)
1675
        finally:
1676
            if master_branch:
1677
                master_branch.unlock()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1678
2279.1.1 by John Arbash Meinel
Branch.push() only needs a read lock.
1679
    @needs_read_lock
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1680
    def push(self, target, overwrite=False, stop_revision=None):
1681
        """Updates branch.push to be bound branch aware."""
1682
        bound_location = target.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1683
        master_branch = None
1684
        if bound_location and target.base != bound_location:
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1685
            # not pushing to master, so we need to update master.
1686
            master_branch = target.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1687
            master_branch.lock_write()
1688
        try:
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1689
            if master_branch:
1690
                # push into the master from this branch.
1691
                super(BzrBranch5, self).push(master_branch, overwrite,
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1692
                    stop_revision, _run_hooks=False)
1693
            # and push into the target branch from this. Note that we push from
1694
            # this branch again, because its considered the highest bandwidth
1695
            # repository.
1696
            return super(BzrBranch5, self).push(target, overwrite,
1697
                stop_revision, _hook_master=master_branch)
1698
        finally:
1699
            if master_branch:
1700
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1701
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1702
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1703
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1704
            return self.control_files.get_utf8('bound').read()[:-1]
1705
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1706
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1707
1708
    @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.
1709
    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
1710
        """Return the branch we are bound to.
1711
        
1712
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1713
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1714
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1715
        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.
1716
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1717
        # 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
1718
        """
1719
        bound_loc = self.get_bound_location()
1720
        if not bound_loc:
1721
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1722
        try:
1723
            return Branch.open(bound_loc)
1724
        except (errors.NotBranchError, errors.ConnectionError), e:
1725
            raise errors.BoundBranchConnectionFailure(
1726
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1727
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1728
    @needs_write_lock
1729
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1730
        """Set the target where this branch is bound to.
1731
1732
        :param location: URL to the target branch
1733
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1734
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1735
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1736
        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.
1737
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1738
                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.
1739
            except NoSuchFile:
1740
                return False
1741
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1742
1743
    @needs_write_lock
1744
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1745
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1746
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1747
        This does not push or pull data between the branches, though it does
1748
        check for divergence to raise an error when the branches are not
1749
        either the same, or one a prefix of the other. That behaviour may not
1750
        be useful, so that check may be removed in future.
1751
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1752
        :param other: The branch to bind to
1753
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1754
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1755
        # TODO: jam 20051230 Consider checking if the target is bound
1756
        #       It is debatable whether you should be able to bind to
1757
        #       a branch which is itself bound.
1758
        #       Committing is obviously forbidden,
1759
        #       but binding itself may not be.
1760
        #       Since we *have* to check at commit time, we don't
1761
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1762
1763
        # we want to raise diverged if:
1764
        # last_rev is not in the other_last_rev history, AND
1765
        # other_last_rev is not in our history, and do it without pulling
1766
        # history around
1767
        last_rev = self.last_revision()
1768
        if last_rev is not None:
1769
            other.lock_read()
1770
            try:
1771
                other_last_rev = other.last_revision()
1772
                if other_last_rev is not None:
1773
                    # neither branch is new, we have to do some work to
1774
                    # ascertain diversion.
1775
                    remote_graph = other.repository.get_revision_graph(
1776
                        other_last_rev)
1777
                    local_graph = self.repository.get_revision_graph(last_rev)
1778
                    if (last_rev not in remote_graph and
1779
                        other_last_rev not in local_graph):
1780
                        raise errors.DivergedBranches(self, other)
1781
            finally:
1782
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1783
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1784
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1785
    @needs_write_lock
1786
    def unbind(self):
1787
        """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.
1788
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1789
1587.1.10 by Robert Collins
update updates working tree and branch together.
1790
    @needs_write_lock
1791
    def update(self):
1792
        """Synchronise this branch with the master branch if any. 
1793
1794
        :return: None or the last_revision that was pivoted out during the
1795
                 update.
1796
        """
1797
        master = self.get_master_branch()
1798
        if master is not None:
1799
            old_tip = self.last_revision()
1800
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1801
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1802
                return None
1803
            return old_tip
1804
        return None
1805
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1806
2220.2.10 by Martin Pool
(broken) start moving things to branches
1807
class BzrBranchExperimental(BzrBranch5):
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1808
    """Bzr experimental branch format
1809
1810
    This format has:
1811
     - a revision-history file.
1812
     - a format string
1813
     - a lock dir guarding the branch itself
1814
     - all of this stored in a branch/ subdirectory
1815
     - works with shared repositories.
1816
     - a tag dictionary in the branch
1817
1818
    This format is new in bzr 0.15, but shouldn't be used for real data, 
1819
    only for testing.
1820
1821
    This class acts as it's own BranchFormat.
1822
    """
1823
1824
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1825
1826
    @classmethod
1827
    def get_format_string(cls):
1828
        """See BranchFormat.get_format_string()."""
1829
        return "Bazaar-NG branch format experimental\n"
1830
1831
    @classmethod
1832
    def get_format_description(cls):
1833
        """See BranchFormat.get_format_description()."""
1834
        return "Experimental branch format"
1835
1836
    @classmethod
1837
    def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1838
            lock_class):
1839
        branch_transport = a_bzrdir.get_branch_transport(cls)
1840
        control_files = lockable_files.LockableFiles(branch_transport,
1841
            lock_filename, lock_class)
1842
        control_files.create_lock()
1843
        control_files.lock_write()
1844
        try:
1845
            for filename, content in utf8_files:
1846
                control_files.put_utf8(filename, content)
1847
        finally:
1848
            control_files.unlock()
1849
        
1850
    @classmethod
1851
    def initialize(cls, a_bzrdir):
1852
        """Create a branch of this format in a_bzrdir."""
1853
        utf8_files = [('format', cls.get_format_string()),
1854
                      ('revision-history', ''),
1855
                      ('branch-name', ''),
1856
                      ('tags', ''),
1857
                      ]
1858
        cls._initialize_control_files(a_bzrdir, utf8_files,
1859
            'lock', lockdir.LockDir)
1860
        return cls.open(a_bzrdir, _found=True)
1861
1862
    @classmethod
1863
    def open(cls, a_bzrdir, _found=False):
1864
        """Return the branch object for a_bzrdir
1865
1866
        _found is a private parameter, do not use it. It is used to indicate
1867
               if format probing has already be done.
1868
        """
1869
        if not _found:
1870
            format = BranchFormat.find_format(a_bzrdir)
1871
            assert format.__class__ == cls
1872
        transport = a_bzrdir.get_branch_transport(None)
1873
        control_files = lockable_files.LockableFiles(transport, 'lock',
1874
                                                     lockdir.LockDir)
1875
        return cls(_format=cls,
1876
            _control_files=control_files,
1877
            a_bzrdir=a_bzrdir,
1878
            _repository=a_bzrdir.find_repository())
1879
1880
    @classmethod
1881
    def is_supported(cls):
1882
        return True
1883
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
1884
    def _make_tags(self):
1885
        return BasicTags(self)
2220.2.10 by Martin Pool
(broken) start moving things to branches
1886
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
1887
    @classmethod
1888
    def supports_tags(cls):
1889
        return True
1890
2220.2.10 by Martin Pool
(broken) start moving things to branches
1891
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1892
BranchFormat.register_format(BzrBranchExperimental)
1893
1894
2230.3.1 by Aaron Bentley
Get branch6 creation working
1895
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1896
1897
    @needs_read_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1898
    def last_revision_info(self):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1899
        revision_string = self.control_files.get('last-revision').read()
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1900
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1901
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1902
        revno = int(revno)
1903
        return revno, revision_id
1904
2230.3.2 by Aaron Bentley
Get all branch tests passing
1905
    def last_revision(self):
1906
        """Return last revision id, or None"""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1907
        revision_id = self.last_revision_info()[1]
2230.3.2 by Aaron Bentley
Get all branch tests passing
1908
        if revision_id == _mod_revision.NULL_REVISION:
1909
            revision_id = None
1910
        return revision_id
1911
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1912
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
1913
        """Simply write out the revision id, with no checks.
1914
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1915
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
1916
1917
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1918
        Intended to be called by set_last_revision_info and
1919
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
1920
        """
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1921
        if revision_id is None:
1922
            revision_id = 'null:'
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1923
        out_string = '%d %s\n' % (revno, revision_id)
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1924
        self.control_files.put_bytes('last-revision', out_string)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1925
2230.3.49 by Aaron Bentley
Fix cache updating
1926
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1927
    def set_last_revision_info(self, revno, revision_id):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1928
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1929
        if self._get_append_revisions_only():
1930
            self._check_history_violation(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1931
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1932
        self._clear_cached_state()
2230.3.49 by Aaron Bentley
Fix cache updating
1933
2230.3.32 by Aaron Bentley
Implement strict history policy
1934
    def _check_history_violation(self, revision_id):
1935
        last_revision = self.last_revision()
1936
        if last_revision is None:
1937
            return
1938
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1939
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
1940
2230.4.1 by Aaron Bentley
Get log as fast branch5
1941
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1942
        """Generate the revision history from last revision
1943
        """
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1944
        history = list(self.repository.iter_reverse_revision_history(
1945
            self.last_revision()))
2230.4.1 by Aaron Bentley
Get log as fast branch5
1946
        history.reverse()
1947
        return history
2230.3.2 by Aaron Bentley
Get all branch tests passing
1948
2230.3.49 by Aaron Bentley
Fix cache updating
1949
    def _write_revision_history(self, history):
1950
        """Factored out of set_revision_history.
1951
1952
        This performs the actual writing to disk, with format-specific checks.
1953
        It is intended to be called by BzrBranch5.set_revision_history.
1954
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
1955
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
1956
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
1957
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1958
            if history != self._lefthand_history(history[-1]):
1959
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
1960
            last_revision = history[-1]
1961
        if self._get_append_revisions_only():
1962
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1963
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1964
2230.3.3 by Aaron Bentley
Add more config testing
1965
    @needs_write_lock
2230.3.9 by Aaron Bentley
Fix most fetch tests
1966
    def append_revision(self, *revision_ids):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1967
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
2230.3.9 by Aaron Bentley
Fix most fetch tests
1968
        if len(revision_ids) == 0:
1969
            return
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1970
        prev_revno, prev_revision = self.last_revision_info()
2230.3.9 by Aaron Bentley
Fix most fetch tests
1971
        for revision in self.repository.get_revisions(revision_ids):
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1972
            if prev_revision == _mod_revision.NULL_REVISION:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1973
                if revision.parent_ids != []:
1974
                    raise errors.NotLeftParentDescendant(self, prev_revision,
1975
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
1976
            else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1977
                if revision.parent_ids[0] != prev_revision:
1978
                    raise errors.NotLeftParentDescendant(self, prev_revision,
1979
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
1980
            prev_revision = revision.revision_id
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1981
        self.set_last_revision_info(prev_revno + len(revision_ids),
1982
                                    revision_ids[-1])
2230.3.9 by Aaron Bentley
Fix most fetch tests
1983
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1984
    @needs_write_lock
1985
    def _set_parent_location(self, url):
1986
        """Set the parent branch"""
1987
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
1988
1989
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1990
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
1991
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1992
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
1993
1994
    def set_push_location(self, location):
1995
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1996
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
1997
1998
    def set_bound_location(self, location):
1999
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
2000
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2001
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2002
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2003
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2004
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2005
            else:
2006
                config.set_user_option('bound', 'False')
2007
                return True
2008
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2009
            self._set_config_location('bound_location', location,
2010
                                      config=config)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2011
            config.set_user_option('bound', 'True')
2012
        return True
2013
2014
    def _get_bound_location(self, bound):
2015
        """Return the bound location in the config file.
2016
2017
        Return None if the bound parameter does not match"""
2018
        config = self.get_config()
2019
        config_bound = (config.get_user_option('bound') == 'True')
2020
        if config_bound != bound:
2021
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2022
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2023
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2024
    def get_bound_location(self):
2025
        """See Branch.set_push_location."""
2026
        return self._get_bound_location(True)
2027
2028
    def get_old_bound_location(self):
2029
        """See Branch.get_old_bound_location"""
2030
        return self._get_bound_location(False)
2031
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2032
    def set_append_revisions_only(self, enabled):
2033
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2034
            value = 'True'
2035
        else:
2036
            value = 'False'
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2037
        self.get_config().set_user_option('append_revisions_only', value)
2230.3.32 by Aaron Bentley
Implement strict history policy
2038
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2039
    def _get_append_revisions_only(self):
2040
        value = self.get_config().get_user_option('append_revisions_only')
2041
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2042
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2043
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2044
        """Synchronize last revision and revision history between branches.
2045
2046
        This version is most efficient when the destination is also a
2047
        BzrBranch6, but works for BzrBranch5, as long as the destination's
2048
        repository contains all the lefthand ancestors of the intended
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2049
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2050
2051
        :param destination: The branch to copy the history into
2052
        :param revision_id: The revision-id to truncate history at.  May
2053
          be None to copy complete history.
2054
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2055
        if revision_id is None:
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2056
            revno, revision_id = self.last_revision_info()
2057
        else:
2058
            revno = self.revision_id_to_revno(revision_id)
2059
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2060
2220.2.27 by Martin Pool
Start adding tags to Branch6
2061
    def _make_tags(self):
2062
        return BasicTags(self)
2063
2230.3.34 by Aaron Bentley
cleanup
2064
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2065
class BranchTestProviderAdapter(object):
2066
    """A tool to generate a suite testing multiple branch formats at once.
2067
2068
    This is done by copying the test once for each transport and injecting
2069
    the transport_server, transport_readonly_server, and branch_format
2070
    classes into each copy. Each copy is also given a new id() to make it
2071
    easy to identify.
2072
    """
2073
2074
    def __init__(self, transport_server, transport_readonly_server, formats):
2075
        self._transport_server = transport_server
2076
        self._transport_readonly_server = transport_readonly_server
2077
        self._formats = formats
2078
    
2079
    def adapt(self, test):
2080
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2081
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2082
            new_test = deepcopy(test)
2083
            new_test.transport_server = self._transport_server
2084
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2085
            new_test.bzrdir_format = bzrdir_format
2086
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2087
            def make_new_test_id():
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
2088
                # the format can be either a class or an instance
2089
                name = getattr(branch_format, '__name__',
2090
                        branch_format.__class__.__name__)
2091
                new_id = "%s(%s)" % (new_test.id(), name)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2092
                return lambda: new_id
2093
            new_test.id = make_new_test_id()
2094
            result.addTest(new_test)
2095
        return result
2096
2097
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2098
######################################################################
2099
# results of operations
2100
2220.2.37 by Martin Pool
Report conflicting tags from push.
2101
2102
class _Result(object):
2103
2104
    def _show_tag_conficts(self, to_file):
2105
        if not getattr(self, 'tag_conflicts', None):
2106
            return
2107
        to_file.write('Conflicting tags:\n')
2108
        for name, value1, value2 in self.tag_conflicts:
2109
            to_file.write('    %s\n' % (name, ))
2110
2111
2112
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2113
    """Result of a Branch.pull operation.
2114
2115
    :ivar old_revno: Revision number before pull.
2116
    :ivar new_revno: Revision number after pull.
2117
    :ivar old_revid: Tip revision id before pull.
2118
    :ivar new_revid: Tip revision id after pull.
2119
    :ivar source_branch: Source (local) branch object.
2120
    :ivar master_branch: Master branch of the target, or None.
2121
    :ivar target_branch: Target/destination branch object.
2122
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2123
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2124
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2125
        # DEPRECATED: pull used to return the change in revno
2126
        return self.new_revno - self.old_revno
2127
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2128
    def report(self, to_file):
2129
        if self.old_revid == self.new_revid:
2130
            to_file.write('No revisions to pull.\n')
2131
        else:
2132
            to_file.write('Now on revision %d.\n' % self.new_revno)
2133
        self._show_tag_conficts(to_file)
2134
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2135
2220.2.37 by Martin Pool
Report conflicting tags from push.
2136
class PushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2137
    """Result of a Branch.push operation.
2138
2139
    :ivar old_revno: Revision number before push.
2140
    :ivar new_revno: Revision number after push.
2141
    :ivar old_revid: Tip revision id before push.
2142
    :ivar new_revid: Tip revision id after push.
2143
    :ivar source_branch: Source branch object.
2144
    :ivar master_branch: Master branch of the target, or None.
2145
    :ivar target_branch: Target/destination branch object.
2146
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2147
2148
    def __int__(self):
2149
        # DEPRECATED: push used to return the change in revno
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2150
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2151
2220.2.37 by Martin Pool
Report conflicting tags from push.
2152
    def report(self, to_file):
2153
        """Write a human-readable description of the result."""
2154
        if self.old_revid == self.new_revid:
2155
            to_file.write('No new revisions to push.\n')
2156
        else:
2157
            to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2158
        self._show_tag_conficts(to_file)
2159
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2160
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2161
class BranchCheckResult(object):
2162
    """Results of checking branch consistency.
2163
2164
    :see: Branch.check
2165
    """
2166
2167
    def __init__(self, branch):
2168
        self.branch = branch
2169
2170
    def report_results(self, verbose):
2171
        """Report the check results via trace.note.
2172
        
2173
        :param verbose: Requests more detailed display of what was checked,
2174
            if any.
2175
        """
2176
        note('checked branch %s format %s',
2177
             self.branch.base,
2178
             self.branch._format)
2179
2180
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2181
class Converter5to6(object):
2182
    """Perform an in-place upgrade of format 5 to format 6"""
2183
2184
    def convert(self, branch):
2185
        # Data for 5 and 6 can peacefully coexist.
2186
        format = BzrBranchFormat6()
2187
        new_branch = format.open(branch.bzrdir, _found=True)
2188
2189
        # Copy source data into target
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2190
        new_branch.set_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2191
        new_branch.set_parent(branch.get_parent())
2192
        new_branch.set_bound_location(branch.get_bound_location())
2193
        new_branch.set_push_location(branch.get_push_location())
2194
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2195
        # New branch has no tags by default
2196
        new_branch.tags._set_tag_dict({})
2197
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2198
        # Copying done; now update target format
2199
        new_branch.control_files.put_utf8('format',
2200
            format.get_format_string())
2201
2202
        # Clean up old files
2203
        new_branch.control_files._transport.delete('revision-history')
2204
        try:
2205
            branch.set_parent(None)
2206
        except NoSuchFile:
2207
            pass
2208
        branch.set_bound_location(None)