/brz/remove-bazaar

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