/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:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
647
            format = self.repository.bzrdir.checkout_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:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
667
            format = self._get_checkout_format()
668
            checkout = format.initialize_on_transport(t)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
669
            BranchReferenceFormat().initialize(checkout, self)
670
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
671
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
672
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
673
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
674
            checkout = checkout_branch.bzrdir
675
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
676
            # pull up to the specified revision_id to set the initial 
677
            # branch tip correctly, and seed it with history.
678
            checkout_branch.pull(self, stop_revision=revision_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
679
        tree = checkout.create_workingtree(revision_id)
2100.3.27 by Aaron Bentley
Enable nested commits
680
        for path, entry in tree.iter_reference_entries():
681
            path = tree.id2path(entry.file_id)
682
            reference_parent = self.reference_parent(entry.file_id, path)
683
            reference_parent.create_checkout(tree.abspath(path),
684
                                             entry.reference_revision,
685
                                             lightweight)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
686
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
687
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
688
    def reference_parent(self, file_id, path):
2100.3.29 by Aaron Bentley
Get merge working initially
689
        """Return the parent branch for a tree-reference file_id
690
        :param file_id: The file_id of the tree reference
691
        :param path: The path of the file_id in the tree
692
        :return: A branch associated with the file_id
693
        """
694
        # FIXME should provide multiple branches, based on config
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
695
        return Branch.open(self.bzrdir.root_transport.clone(path).base)
696
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
697
698
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
699
    """An encapsulation of the initialization and open routines for a format.
700
701
    Formats provide three things:
702
     * An initialization routine,
703
     * a format string,
704
     * an open routine.
705
706
    Formats are placed in an dict by their format string for reference 
707
    during branch opening. Its not required that these be instances, they
708
    can be classes themselves with class methods - it simply depends on 
709
    whether state is needed for a given format or not.
710
711
    Once a format is deprecated, just deprecate the initialize and open
712
    methods on the format class. Do not deprecate the object, as the 
713
    object will be created every time regardless.
714
    """
715
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
716
    _default_format = None
717
    """The default format used for new branches."""
718
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
719
    _formats = {}
720
    """The known formats."""
721
722
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
723
    def find_format(klass, a_bzrdir):
724
        """Return the format for the branch object in a_bzrdir."""
725
        try:
726
            transport = a_bzrdir.get_branch_transport(None)
727
            format_string = transport.get("format").read()
728
            return klass._formats[format_string]
729
        except NoSuchFile:
730
            raise NotBranchError(path=transport.base)
731
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
732
            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.
733
734
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
735
    def get_default_format(klass):
736
        """Return the current default format."""
737
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
738
739
    def get_format_string(self):
740
        """Return the ASCII format string that identifies this format."""
741
        raise NotImplementedError(self.get_format_string)
742
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
743
    def get_format_description(self):
744
        """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).
745
        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
746
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
747
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
748
                           set_format=True):
749
        """Initialize a branch in a bzrdir, with specified files
750
751
        :param a_bzrdir: The bzrdir to initialize the branch in
752
        :param utf8_files: The files to create as a list of
753
            (filename, content) tuples
754
        :param set_format: If True, set the format with
755
            self.get_format_string.  (BzrBranch4 has its format set
756
            elsewhere)
757
        :return: a branch in this format
758
        """
759
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
760
        branch_transport = a_bzrdir.get_branch_transport(self)
761
        lock_map = {
762
            'metadir': ('lock', lockdir.LockDir),
763
            'branch4': ('branch-lock', lockable_files.TransportLock),
764
        }
765
        lock_name, lock_class = lock_map[lock_type]
766
        control_files = lockable_files.LockableFiles(branch_transport,
767
            lock_name, lock_class)
768
        control_files.create_lock()
769
        control_files.lock_write()
770
        if set_format:
771
            control_files.put_utf8('format', self.get_format_string())
772
        try:
773
            for file, content in utf8_files:
774
                control_files.put_utf8(file, content)
775
        finally:
776
            control_files.unlock()
777
        return self.open(a_bzrdir, _found=True)
778
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
779
    def initialize(self, a_bzrdir):
780
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
781
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
782
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.
783
    def is_supported(self):
784
        """Is this format supported?
785
786
        Supported formats can be initialized and opened.
787
        Unsupported formats may not support initialization or committing or 
788
        some other features depending on the reason for not being supported.
789
        """
790
        return True
791
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
792
    def open(self, a_bzrdir, _found=False):
793
        """Return the branch object for a_bzrdir
794
795
        _found is a private parameter, do not use it. It is used to indicate
796
               if format probing has already be done.
797
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
798
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
799
800
    @classmethod
801
    def register_format(klass, format):
802
        klass._formats[format.get_format_string()] = format
803
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.
804
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
805
    def set_default_format(klass, format):
806
        klass._default_format = format
807
808
    @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.
809
    def unregister_format(klass, format):
810
        assert klass._formats[format.get_format_string()] is format
811
        del klass._formats[format.get_format_string()]
812
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
813
    def __str__(self):
814
        return self.get_format_string().rstrip()
815
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
816
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
817
class BranchHooks(dict):
818
    """A dictionary mapping hook name to a list of callables for branch hooks.
819
    
820
    e.g. ['set_rh'] Is the list of items to be called when the
821
    set_revision_history function is invoked.
822
    """
823
824
    def __init__(self):
825
        """Create the default hooks.
826
827
        These are all empty initially, because by default nothing should get
828
        notified.
829
        """
830
        dict.__init__(self)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
831
        # 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.
832
        # invoked whenever the revision history has been set
833
        # with set_revision_history. The api signature is
834
        # (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
835
        # be write-locked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
836
        self['set_rh'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
837
        # invoked after a push operation completes.
838
        # the api signature is
839
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
840
        # where local is the local branch or None, master is the target 
841
        # master branch, and the rest should be self explanatory. The source
842
        # is read locked and the target branches write locked. Source will
843
        # be the local low-latency branch.
844
        self['post_push'] = []
845
        # invoked after a pull operation completes.
846
        # the api signature is
847
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
848
        # where local is the local branch or None, master is the target 
849
        # master branch, and the rest should be self explanatory. The source
850
        # is read locked and the target branches write locked. The local
851
        # branch is the low-latency branch.
852
        self['post_pull'] = []
853
        # invoked after a commit operation completes.
854
        # the api signature is 
855
        # (local, master, old_revno, old_revid, new_revno, new_revid)
856
        # old_revid is NULL_REVISION for the first commit to a branch.
857
        self['post_commit'] = []
858
        # invoked after a uncommit operation completes.
859
        # the api signature is
860
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
861
        # local is the local branch or None, master is the target branch,
862
        # and an empty branch recieves new_revno of 0, new_revid of None.
863
        self['post_uncommit'] = []
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
864
865
    def install_hook(self, hook_name, a_callable):
866
        """Install a_callable in to the hook hook_name.
867
868
        :param hook_name: A hook name. See the __init__ method of BranchHooks
869
            for the complete list of hooks.
870
        :param a_callable: The callable to be invoked when the hook triggers.
871
            The exact signature will depend on the hook - see the __init__ 
872
            method of BranchHooks for details on each hook.
873
        """
874
        try:
875
            self[hook_name].append(a_callable)
876
        except KeyError:
877
            raise errors.UnknownHook('branch', hook_name)
878
879
880
# install the default hooks into the Branch class.
881
Branch.hooks = BranchHooks()
882
883
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
884
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
885
    """Bzr branch format 4.
886
887
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
888
     - 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.
889
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
890
    """
891
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
892
    def get_format_description(self):
893
        """See BranchFormat.get_format_description()."""
894
        return "Branch format 4"
895
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
896
    def initialize(self, a_bzrdir):
897
        """Create a branch of this format in a_bzrdir."""
898
        utf8_files = [('revision-history', ''),
899
                      ('branch-name', ''),
900
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
901
        return self._initialize_helper(a_bzrdir, utf8_files,
902
                                       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.
903
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
904
    def __init__(self):
905
        super(BzrBranchFormat4, self).__init__()
906
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
907
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
908
    def open(self, a_bzrdir, _found=False):
909
        """Return the branch object for a_bzrdir
910
911
        _found is a private parameter, do not use it. It is used to indicate
912
               if format probing has already be done.
913
        """
914
        if not _found:
915
            # we are being called directly and must probe.
916
            raise NotImplementedError
917
        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.
918
                         _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.
919
                         a_bzrdir=a_bzrdir,
920
                         _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.
921
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
922
    def __str__(self):
923
        return "Bazaar-NG branch format 4"
924
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
925
926
class BzrBranchFormat5(BranchFormat):
927
    """Bzr branch format 5.
928
929
    This format has:
930
     - a revision-history file.
931
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
932
     - a lock dir guarding the branch itself
933
     - 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.
934
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
935
936
    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.
937
    """
938
939
    def get_format_string(self):
940
        """See BranchFormat.get_format_string()."""
941
        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
942
943
    def get_format_description(self):
944
        """See BranchFormat.get_format_description()."""
945
        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.
946
        
947
    def initialize(self, a_bzrdir):
948
        """Create a branch of this format in a_bzrdir."""
949
        utf8_files = [('revision-history', ''),
950
                      ('branch-name', ''),
951
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
952
        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.
953
954
    def __init__(self):
955
        super(BzrBranchFormat5, self).__init__()
956
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
957
958
    def open(self, a_bzrdir, _found=False):
959
        """Return the branch object for a_bzrdir
960
961
        _found is a private parameter, do not use it. It is used to indicate
962
               if format probing has already be done.
963
        """
964
        if not _found:
965
            format = BranchFormat.find_format(a_bzrdir)
966
            assert format.__class__ == self.__class__
967
        transport = a_bzrdir.get_branch_transport(None)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
968
        control_files = lockable_files.LockableFiles(transport, 'lock',
969
                                                     lockdir.LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
970
        return BzrBranch5(_format=self,
971
                          _control_files=control_files,
972
                          a_bzrdir=a_bzrdir,
973
                          _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.
974
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
975
    def __str__(self):
976
        return "Bazaar-NG Metadir branch format 5"
977
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
978
2230.3.1 by Aaron Bentley
Get branch6 creation working
979
class BzrBranchFormat6(BzrBranchFormat5):
980
    """Branch format with last-revision
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
981
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
982
    Unlike previous formats, this has no explicit revision history. Instead,
983
    this just stores the last-revision, and the left-hand history leading
984
    up to there is the history.
985
986
    This format was introduced in bzr 0.15
2230.3.1 by Aaron Bentley
Get branch6 creation working
987
    """
988
989
    def get_format_string(self):
990
        """See BranchFormat.get_format_string()."""
991
        return "Bazaar-NG branch format 6\n"
992
993
    def get_format_description(self):
994
        """See BranchFormat.get_format_description()."""
995
        return "Branch format 6"
996
997
    def initialize(self, a_bzrdir):
998
        """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
999
        utf8_files = [('last-revision', '0 null:\n'),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1000
                      ('branch-name', ''),
1001
                      ('branch.conf', '')
1002
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1003
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1004
1005
    def open(self, a_bzrdir, _found=False):
1006
        """Return the branch object for a_bzrdir
1007
1008
        _found is a private parameter, do not use it. It is used to indicate
1009
               if format probing has already be done.
1010
        """
1011
        if not _found:
1012
            format = BranchFormat.find_format(a_bzrdir)
1013
            assert format.__class__ == self.__class__
1014
        transport = a_bzrdir.get_branch_transport(None)
1015
        control_files = lockable_files.LockableFiles(transport, 'lock',
1016
                                                     lockdir.LockDir)
1017
        return BzrBranch6(_format=self,
1018
                          _control_files=control_files,
1019
                          a_bzrdir=a_bzrdir,
1020
                          _repository=a_bzrdir.find_repository())
1021
1022
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.
1023
class BranchReferenceFormat(BranchFormat):
1024
    """Bzr branch reference format.
1025
1026
    Branch references are used in implementing checkouts, they
1027
    act as an alias to the real branch which is at some other url.
1028
1029
    This format has:
1030
     - A location file
1031
     - a format string
1032
    """
1033
1034
    def get_format_string(self):
1035
        """See BranchFormat.get_format_string()."""
1036
        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
1037
1038
    def get_format_description(self):
1039
        """See BranchFormat.get_format_description()."""
1040
        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.
1041
        
1042
    def initialize(self, a_bzrdir, target_branch=None):
1043
        """Create a branch of this format in a_bzrdir."""
1044
        if target_branch is None:
1045
            # this format does not implement branch itself, thus the implicit
1046
            # creation contract must see it as uninitializable
1047
            raise errors.UninitializableFormat(self)
1048
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1049
        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
1050
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1051
            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
1052
        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.
1053
        return self.open(a_bzrdir, _found=True)
1054
1055
    def __init__(self):
1056
        super(BranchReferenceFormat, self).__init__()
1057
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1058
1059
    def _make_reference_clone_function(format, a_branch):
1060
        """Create a clone() routine for a branch dynamically."""
1061
        def clone(to_bzrdir, revision_id=None):
1062
            """See Branch.clone()."""
1063
            return format.initialize(to_bzrdir, a_branch)
1064
            # cannot obey revision_id limits when cloning a reference ...
1065
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1066
            # emit some sort of warning/error to the caller ?!
1067
        return clone
1068
1069
    def open(self, a_bzrdir, _found=False):
1070
        """Return the branch that the branch reference in a_bzrdir points at.
1071
1072
        _found is a private parameter, do not use it. It is used to indicate
1073
               if format probing has already be done.
1074
        """
1075
        if not _found:
1076
            format = BranchFormat.find_format(a_bzrdir)
1077
            assert format.__class__ == self.__class__
1078
        transport = a_bzrdir.get_branch_transport(None)
1079
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
1080
        result = real_bzrdir.open_branch()
1081
        # this changes the behaviour of result.clone to create a new reference
1082
        # rather than a copy of the content of the branch.
1083
        # I did not use a proxy object because that needs much more extensive
1084
        # testing, and we are only changing one behaviour at the moment.
1085
        # If we decide to alter more behaviours - i.e. the implicit nickname
1086
        # then this should be refactored to introduce a tested proxy branch
1087
        # and a subclass of that for use in overriding clone() and ....
1088
        # - RBC 20060210
1089
        result.clone = self._make_reference_clone_function(result)
1090
        return result
1091
1092
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1093
# formats which have no format string are not discoverable
1094
# 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.
1095
__default_format = BzrBranchFormat5()
1096
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.
1097
BranchFormat.register_format(BranchReferenceFormat())
2230.3.1 by Aaron Bentley
Get branch6 creation working
1098
BranchFormat.register_format(BzrBranchFormat6())
2230.3.28 by Aaron Bentley
Restore default formats
1099
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1100
_legacy_formats = [BzrBranchFormat4(),
1101
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1102
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1103
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1104
    """A branch stored in the actual filesystem.
1105
1106
    Note that it's "local" in the context of the filesystem; it doesn't
1107
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1108
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
1109
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1110
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1111
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
1112
                 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.
1113
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
1114
        """Create new branch object at a particular location.
1115
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1116
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1117
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
1118
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
1119
             unversioned directory.  If False, the branch must already
1120
             be versioned.
1121
1293 by Martin Pool
- add Branch constructor option to relax version check
1122
        relax_version_check -- If true, the usual check for the branch
1123
            version is not applied.  This is intended only for
1124
            upgrade/recovery type use; it's not guaranteed that
1125
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
1126
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1127
        if a_bzrdir is None:
1128
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
1129
        else:
1130
            self.bzrdir = a_bzrdir
1131
        self._transport = self.bzrdir.transport.clone('..')
1534.4.28 by Robert Collins
first cut at merge from integration.
1132
        self._base = self._transport.base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1133
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1134
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1135
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1136
        self.control_files = _control_files
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1137
        if deprecated_passed(init):
1138
            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.
1139
                 "deprecated as of bzr 0.8. Please use Branch.create().",
1140
                 DeprecationWarning,
1141
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1142
            if init:
1143
                # this is slower than before deprecation, oh well never mind.
1144
                # -> its deprecated.
1145
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
1146
        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.
1147
        if deprecated_passed(relax_version_check):
1148
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1149
                 "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.
1150
                 "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.
1151
                 "open() method.",
1152
                 DeprecationWarning,
1153
                 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.
1154
            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.
1155
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
1156
                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.
1157
        if deprecated_passed(transport):
1158
            warn("BzrBranch.__init__(transport=XXX...): The transport "
1159
                 "parameter is deprecated as of bzr 0.8. "
1160
                 "Please use Branch.open, or bzrdir.open_branch().",
1161
                 DeprecationWarning,
1162
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1163
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1164
1 by mbp at sourcefrog
import from baz patch-364
1165
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1166
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1167
1168
    __repr__ = __str__
1169
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1170
    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
1171
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1172
1442.1.5 by Robert Collins
Give branch.base a docstring.
1173
    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,
1174
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1175
    def _finish_transaction(self):
1176
        """Exit the current transaction."""
1185.65.13 by Robert Collins
Merge from integration
1177
        return self.control_files._finish_transaction()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1178
1179
    def get_transaction(self):
1185.65.13 by Robert Collins
Merge from integration
1180
        """Return the current active transaction.
1181
1182
        If no transaction is active, this returns a passthrough object
1183
        for which all data is immediately flushed and no caching happens.
1184
        """
1185
        # this is an explicit function so that we can do tricky stuff
1186
        # when the storage in rev_storage is elsewhere.
1187
        # we probably need to hook the two 'lock a location' and 
1188
        # 'have a transaction' together more delicately, so that
1189
        # we can have two locks (branch and storage) and one transaction
1190
        # ... and finishing the transaction unlocks both, but unlocking
1191
        # does not. - RBC 20051121
1192
        return self.control_files.get_transaction()
1193
1194
    def _set_transaction(self, transaction):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1195
        """Set a new active transaction."""
1185.65.13 by Robert Collins
Merge from integration
1196
        return self.control_files._set_transaction(transaction)
353 by Martin Pool
- Per-branch locks in read and write modes.
1197
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1198
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1199
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1200
        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.
1201
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.
1202
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
1203
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
1204
1534.4.8 by Robert Collins
Unfuck upgrade.
1205
        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.
1206
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
1207
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1208
        The format parameter is either None or the branch format class
1209
        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.
1210
1211
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
1212
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1213
        if format is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1214
            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.
1215
        self._format = format
1216
        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.
1217
1508.1.15 by Robert Collins
Merge from mpool.
1218
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1219
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1220
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1221
        tree = self.repository.revision_tree(self.last_revision())
1222
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1223
1694.2.6 by Martin Pool
[merge] bzr.dev
1224
    def is_locked(self):
1225
        return self.control_files.is_locked()
1226
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1227
    def lock_write(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1228
        self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1229
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1230
            self.control_files.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1231
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1232
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1233
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1234
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1235
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1236
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1237
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1238
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1239
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1240
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1241
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1242
1243
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1244
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1245
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1246
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1247
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1248
            self.repository.unlock()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1249
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1250
    def peek_lock_mode(self):
1251
        if self.control_files._lock_count == 0:
1252
            return None
1253
        else:
1254
            return self.control_files._lock_mode
1255
1694.2.6 by Martin Pool
[merge] bzr.dev
1256
    def get_physical_lock_status(self):
1257
        return self.control_files.get_physical_lock_status()
1258
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1259
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1260
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1261
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1262
        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.
1263
1264
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1265
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1266
        """See Branch.append_revision."""
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1267
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
905 by Martin Pool
- merge aaron's append_multiple.patch
1268
        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
1269
            _mod_revision.check_not_reserved_id(revision_id)
905 by Martin Pool
- merge aaron's append_multiple.patch
1270
            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.
1271
        rev_history = self.revision_history()
1272
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1273
        self.set_revision_history(rev_history)
1274
2230.3.49 by Aaron Bentley
Fix cache updating
1275
    def _write_revision_history(self, history):
1276
        """Factored out of set_revision_history.
1277
1278
        This performs the actual writing to disk.
1279
        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
1280
        self.control_files.put_bytes(
2230.3.49 by Aaron Bentley
Fix cache updating
1281
            'revision-history', '\n'.join(history))
1282
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1283
    @needs_write_lock
1284
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1285
        """See Branch.set_revision_history."""
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1286
        rev_history = [osutils.safe_revision_id(r) for r in rev_history]
2230.3.49 by Aaron Bentley
Fix cache updating
1287
        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
1288
        transaction = self.get_transaction()
1289
        history = transaction.map.find_revision_history()
1290
        if history is not None:
1291
            # update the revision history in the identity map.
1292
            history[:] = list(rev_history)
1293
            # this call is disabled because revision_history is 
1294
            # not really an object yet, and the transaction is for objects.
1295
            # transaction.register_dirty(history)
1296
        else:
1297
            transaction.map.add_revision_history(rev_history)
1298
            # this call is disabled because revision_history is 
1299
            # not really an object yet, and the transaction is for objects.
1300
            # transaction.register_clean(history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1301
        for hook in Branch.hooks['set_rh']:
1302
            hook(self, rev_history)
233 by mbp at sourcefrog
- more output from test.sh
1303
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1304
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1305
    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
1306
        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
1307
        history = self._lefthand_history(revision_id)
1308
        assert len(history) == revno, '%d != %d' % (len(history), revno)
1309
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1310
2230.4.1 by Aaron Bentley
Get log as fast branch5
1311
    def _gen_revision_history(self):
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1312
        get_cached_utf8 = cache_utf8.get_cached_utf8
1313
        history = [get_cached_utf8(l.rstrip('\r\n')) for l in
2230.4.1 by Aaron Bentley
Get log as fast branch5
1314
                self.control_files.get('revision-history').readlines()]
1315
        return history
1316
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1317
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
1318
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1319
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1320
        transaction = self.get_transaction()
1321
        history = transaction.map.find_revision_history()
1322
        if history is not None:
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1323
            # mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
1324
            return list(history)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1325
        history = self._gen_revision_history()
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1326
        transaction.map.add_revision_history(history)
1327
        # this call is disabled because revision_history is 
1328
        # not really an object yet, and the transaction is for objects.
1329
        # transaction.register_clean(history, precious=True)
1330
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
1331
2230.3.2 by Aaron Bentley
Get all branch tests passing
1332
    def _lefthand_history(self, revision_id, last_rev=None,
1333
                          other_branch=None):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1334
        # stop_revision must be a descendant of last_revision
1335
        stop_graph = self.repository.get_revision_graph(revision_id)
1336
        if last_rev is not None and last_rev not in stop_graph:
1337
            # our previous tip is not merged into stop_revision
1338
            raise errors.DivergedBranches(self, other_branch)
1339
        # make a new revision history from the graph
1340
        current_rev_id = revision_id
1341
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1342
        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.
1343
            new_history.append(current_rev_id)
1344
            current_rev_id_parents = stop_graph[current_rev_id]
1345
            try:
1346
                current_rev_id = current_rev_id_parents[0]
1347
            except IndexError:
1348
                current_rev_id = None
1349
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1350
        return new_history
1351
1352
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1353
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1354
        other_branch=None):
1355
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1356
2230.3.2 by Aaron Bentley
Get all branch tests passing
1357
        :param revision_id: the new tip to use.
1358
        :param last_rev: The previous last_revision. If not None, then this
1359
            must be a ancestory of revision_id, or DivergedBranches is raised.
1360
        :param other_branch: The other branch that DivergedBranches should
1361
            raise with respect to.
1362
        """
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1363
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1364
        self.set_revision_history(self._lefthand_history(revision_id,
1365
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1366
1367
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1368
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1369
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1370
        other.lock_read()
1371
        try:
1372
            if stop_revision is None:
1373
                stop_revision = other.last_revision()
1374
                if stop_revision is None:
1375
                    # if there are no commits, we're done.
1376
                    return
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1377
            else:
1378
                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
1379
            # whats the current last revision, before we fetch [and change it
1380
            # possibly]
1381
            last_rev = self.last_revision()
1382
            # we fetch here regardless of whether we need to so that we pickup
1383
            # filled in ghosts.
1384
            self.fetch(other, stop_revision)
1385
            my_ancestry = self.repository.get_ancestry(last_rev)
1386
            if stop_revision in my_ancestry:
1387
                # last_revision is a descendant of stop_revision
1388
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1389
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1390
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1391
        finally:
1392
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1393
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1394
    def basis_tree(self):
1395
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1396
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1397
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1398
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1399
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1400
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1401
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1402
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1403
        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.
1404
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1405
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1406
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1407
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1408
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1409
    def pull(self, source, overwrite=False, stop_revision=None,
1410
        _hook_master=None, _run_hooks=True):
1411
        """See Branch.pull.
1412
1413
        :param _hook_master: Private parameter - set the branch to 
1414
            be supplied as the master to push hooks.
1415
        :param _run_hooks: Private parameter - allow disabling of
1416
            hooks, used when pushing to a master branch.
1417
        """
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1418
        source.lock_read()
1419
        try:
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1420
            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.
1421
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1422
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1423
            except DivergedBranches:
1424
                if not overwrite:
1425
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1426
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1427
                self.set_revision_history(source.revision_history())
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1428
            new_count, new_tip = self.last_revision_info()
1429
            if _run_hooks:
1430
                if _hook_master:
1431
                    _hook_local = self
1432
                else:
1433
                    _hook_master = self
1434
                    _hook_local = None
1435
                for hook in Branch.hooks['post_pull']:
1436
                    hook(source, _hook_local, _hook_master, old_count, old_tip,
1437
                        new_count, new_tip)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1438
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1439
        finally:
1440
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1441
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1442
    def _get_parent_location(self):
1443
        _locs = ['parent', 'pull', 'x-pull']
1444
        for l in _locs:
1445
            try:
1446
                return self.control_files.get(l).read().strip('\n')
1447
            except NoSuchFile:
1448
                pass
1449
        return None
1450
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1451
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1452
    def push(self, target, overwrite=False, stop_revision=None,
1453
        _hook_master=None, _run_hooks=True):
1454
        """See Branch.push.
1455
        
1456
        :param _hook_master: Private parameter - set the branch to 
1457
            be supplied as the master to push hooks.
1458
        :param _run_hooks: Private parameter - allow disabling of
1459
            hooks, used when pushing to a master branch.
1460
        """
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1461
        target.lock_write()
1462
        try:
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1463
            old_count, old_tip = target.last_revision_info()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1464
            try:
1465
                target.update_revisions(self, stop_revision)
1466
            except DivergedBranches:
1467
                if not overwrite:
1468
                    raise
1469
            if overwrite:
1470
                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
1471
            new_count, new_tip = target.last_revision_info()
1472
            if _run_hooks:
1473
                if _hook_master:
1474
                    _hook_local = target
1475
                else:
1476
                    _hook_master = target
1477
                    _hook_local = None
1478
                for hook in Branch.hooks['post_push']:
1479
                    hook(self, _hook_local, _hook_master, old_count, old_tip,
1480
                        new_count, new_tip)
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1481
            return new_count - old_count
1482
        finally:
1483
            target.unlock()
1484
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1485
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1486
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1487
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1488
        assert self.base[-1] == '/'
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1489
        parent = self._get_parent_location()
1490
        if parent is None:
1491
            return parent
1492
        # This is an old-format absolute path to a local branch
1493
        # turn it into a url
1494
        if parent.startswith('/'):
1495
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1496
        try:
1497
            return urlutils.join(self.base[:-1], parent)
1498
        except errors.InvalidURLJoin, e:
1499
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1500
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1501
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1502
        """See Branch.get_push_location."""
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1503
        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.
1504
        return push_loc
1505
1506
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1507
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1508
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1509
            'push_location', location,
1510
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1511
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1512
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1513
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1514
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1515
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1516
        # URLs should never be unicode, even on the local fs,
1517
        # FIXUP this and get_parent in a future branch format bump:
1518
        # read and rewrite the file, and have the new format code read
1519
        # using .get not .get_utf8. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1520
        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
1521
            if isinstance(url, unicode):
1522
                try: 
1523
                    url = url.encode('ascii')
1524
                except UnicodeEncodeError:
1525
                    raise bzrlib.errors.InvalidURL(url,
1526
                        "Urls must be 7-bit ascii, "
1527
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1528
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1529
        self._set_parent_location(url)
1530
1531
    def _set_parent_location(self, url):
1532
        if url is None:
1533
            self.control_files._transport.delete('parent')
1534
        else:
1535
            assert isinstance(url, str)
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1536
            self.control_files.put_bytes('parent', url + '\n')
1150 by Martin Pool
- add new Branch.set_parent and tests
1537
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1538
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1539
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1540
        """DEPRECATED; call get_config instead.  
1541
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1542
        return TreeConfig(self)
1543
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1544
1545
class BzrBranch5(BzrBranch):
1546
    """A format 5 branch. This supports new features over plan branches.
1547
1548
    It has support for a master_branch which is the data for bound branches.
1549
    """
1550
1551
    def __init__(self,
1552
                 _format,
1553
                 _control_files,
1554
                 a_bzrdir,
1555
                 _repository):
1556
        super(BzrBranch5, self).__init__(_format=_format,
1557
                                         _control_files=_control_files,
1558
                                         a_bzrdir=a_bzrdir,
1559
                                         _repository=_repository)
1560
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1561
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1562
    def pull(self, source, overwrite=False, stop_revision=None,
1563
        _run_hooks=True):
1564
        """Extends branch.pull to be bound branch aware.
1565
        
1566
        :param _run_hooks: Private parameter used to force hook running
1567
            off during bound branch double-pushing.
1568
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1569
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1570
        master_branch = None
1571
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1572
            # not pulling from master, so we need to update master.
1573
            master_branch = self.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1574
            master_branch.lock_write()
1575
        try:
1576
            if master_branch:
1577
                # pull from source into master.
1578
                master_branch.pull(source, overwrite, stop_revision,
1579
                    _run_hooks=False)
1580
            return super(BzrBranch5, self).pull(source, overwrite,
1581
                stop_revision, _hook_master=master_branch,
1582
                _run_hooks=_run_hooks)
1583
        finally:
1584
            if master_branch:
1585
                master_branch.unlock()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1586
2279.1.1 by John Arbash Meinel
Branch.push() only needs a read lock.
1587
    @needs_read_lock
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1588
    def push(self, target, overwrite=False, stop_revision=None):
1589
        """Updates branch.push to be bound branch aware."""
1590
        bound_location = target.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1591
        master_branch = None
1592
        if bound_location and target.base != bound_location:
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1593
            # not pushing to master, so we need to update master.
1594
            master_branch = target.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1595
            master_branch.lock_write()
1596
        try:
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1597
            if master_branch:
1598
                # push into the master from this branch.
1599
                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
1600
                    stop_revision, _run_hooks=False)
1601
            # and push into the target branch from this. Note that we push from
1602
            # this branch again, because its considered the highest bandwidth
1603
            # repository.
1604
            return super(BzrBranch5, self).push(target, overwrite,
1605
                stop_revision, _hook_master=master_branch)
1606
        finally:
1607
            if master_branch:
1608
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1609
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1610
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1611
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1612
            return self.control_files.get_utf8('bound').read()[:-1]
1613
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1614
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1615
1616
    @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.
1617
    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
1618
        """Return the branch we are bound to.
1619
        
1620
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1621
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1622
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1623
        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.
1624
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1625
        # 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
1626
        """
1627
        bound_loc = self.get_bound_location()
1628
        if not bound_loc:
1629
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1630
        try:
1631
            return Branch.open(bound_loc)
1632
        except (errors.NotBranchError, errors.ConnectionError), e:
1633
            raise errors.BoundBranchConnectionFailure(
1634
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1635
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1636
    @needs_write_lock
1637
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1638
        """Set the target where this branch is bound to.
1639
1640
        :param location: URL to the target branch
1641
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1642
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1643
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1644
        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.
1645
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1646
                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.
1647
            except NoSuchFile:
1648
                return False
1649
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1650
1651
    @needs_write_lock
1652
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1653
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1654
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1655
        This does not push or pull data between the branches, though it does
1656
        check for divergence to raise an error when the branches are not
1657
        either the same, or one a prefix of the other. That behaviour may not
1658
        be useful, so that check may be removed in future.
1659
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1660
        :param other: The branch to bind to
1661
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1662
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1663
        # TODO: jam 20051230 Consider checking if the target is bound
1664
        #       It is debatable whether you should be able to bind to
1665
        #       a branch which is itself bound.
1666
        #       Committing is obviously forbidden,
1667
        #       but binding itself may not be.
1668
        #       Since we *have* to check at commit time, we don't
1669
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1670
1671
        # we want to raise diverged if:
1672
        # last_rev is not in the other_last_rev history, AND
1673
        # other_last_rev is not in our history, and do it without pulling
1674
        # history around
1675
        last_rev = self.last_revision()
1676
        if last_rev is not None:
1677
            other.lock_read()
1678
            try:
1679
                other_last_rev = other.last_revision()
1680
                if other_last_rev is not None:
1681
                    # neither branch is new, we have to do some work to
1682
                    # ascertain diversion.
1683
                    remote_graph = other.repository.get_revision_graph(
1684
                        other_last_rev)
1685
                    local_graph = self.repository.get_revision_graph(last_rev)
1686
                    if (last_rev not in remote_graph and
1687
                        other_last_rev not in local_graph):
1688
                        raise errors.DivergedBranches(self, other)
1689
            finally:
1690
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1691
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1692
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1693
    @needs_write_lock
1694
    def unbind(self):
1695
        """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.
1696
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1697
1587.1.10 by Robert Collins
update updates working tree and branch together.
1698
    @needs_write_lock
1699
    def update(self):
1700
        """Synchronise this branch with the master branch if any. 
1701
1702
        :return: None or the last_revision that was pivoted out during the
1703
                 update.
1704
        """
1705
        master = self.get_master_branch()
1706
        if master is not None:
1707
            old_tip = self.last_revision()
1708
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1709
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1710
                return None
1711
            return old_tip
1712
        return None
1713
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1714
2230.3.1 by Aaron Bentley
Get branch6 creation working
1715
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1716
1717
    @needs_read_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1718
    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
1719
        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
1720
        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
1721
        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
1722
        revno = int(revno)
1723
        return revno, revision_id
1724
2230.3.2 by Aaron Bentley
Get all branch tests passing
1725
    def last_revision(self):
1726
        """Return last revision id, or None"""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1727
        revision_id = self.last_revision_info()[1]
2230.3.2 by Aaron Bentley
Get all branch tests passing
1728
        if revision_id == _mod_revision.NULL_REVISION:
1729
            revision_id = None
1730
        return revision_id
1731
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1732
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
1733
        """Simply write out the revision id, with no checks.
1734
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1735
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
1736
1737
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1738
        Intended to be called by set_last_revision_info and
1739
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
1740
        """
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1741
        if revision_id is None:
1742
            revision_id = 'null:'
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1743
        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
1744
        self.control_files.put_bytes('last-revision', out_string)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1745
2230.3.49 by Aaron Bentley
Fix cache updating
1746
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1747
    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
1748
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1749
        if self._get_append_revisions_only():
1750
            self._check_history_violation(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1751
        self._write_last_revision_info(revno, revision_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1752
        transaction = self.get_transaction()
1753
        cached_history = transaction.map.find_revision_history()
1754
        if cached_history is not None:
1755
            transaction.map.remove_object(cached_history)
1756
2230.3.32 by Aaron Bentley
Implement strict history policy
1757
    def _check_history_violation(self, revision_id):
1758
        last_revision = self.last_revision()
1759
        if last_revision is None:
1760
            return
1761
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1762
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
1763
2230.4.1 by Aaron Bentley
Get log as fast branch5
1764
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1765
        """Generate the revision history from last revision
1766
        """
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1767
        history = list(self.repository.iter_reverse_revision_history(
1768
            self.last_revision()))
2230.4.1 by Aaron Bentley
Get log as fast branch5
1769
        history.reverse()
1770
        return history
2230.3.2 by Aaron Bentley
Get all branch tests passing
1771
2230.3.49 by Aaron Bentley
Fix cache updating
1772
    def _write_revision_history(self, history):
1773
        """Factored out of set_revision_history.
1774
1775
        This performs the actual writing to disk, with format-specific checks.
1776
        It is intended to be called by BzrBranch5.set_revision_history.
1777
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
1778
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
1779
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
1780
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1781
            if history != self._lefthand_history(history[-1]):
1782
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
1783
            last_revision = history[-1]
1784
        if self._get_append_revisions_only():
1785
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1786
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1787
2230.3.3 by Aaron Bentley
Add more config testing
1788
    @needs_write_lock
2230.3.9 by Aaron Bentley
Fix most fetch tests
1789
    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
1790
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
2230.3.9 by Aaron Bentley
Fix most fetch tests
1791
        if len(revision_ids) == 0:
1792
            return
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1793
        prev_revno, prev_revision = self.last_revision_info()
2230.3.9 by Aaron Bentley
Fix most fetch tests
1794
        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
1795
            if prev_revision == _mod_revision.NULL_REVISION:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1796
                if revision.parent_ids != []:
1797
                    raise errors.NotLeftParentDescendant(self, prev_revision,
1798
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
1799
            else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1800
                if revision.parent_ids[0] != prev_revision:
1801
                    raise errors.NotLeftParentDescendant(self, prev_revision,
1802
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
1803
            prev_revision = revision.revision_id
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1804
        self.set_last_revision_info(prev_revno + len(revision_ids),
1805
                                    revision_ids[-1])
2230.3.9 by Aaron Bentley
Fix most fetch tests
1806
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1807
    def _set_config_location(self, name, url, config=None,
1808
                             make_relative=False):
1809
        if config is None:
1810
            config = self.get_config()
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1811
        if url is None:
1812
            url = ''
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1813
        elif make_relative:
1814
            url = urlutils.relative_url(self.base, url)
1815
        config.set_user_option(name, url)
1816
1817
1818
    def _get_config_location(self, name, config=None):
1819
        if config is None:
1820
            config = self.get_config()
1821
        location = config.get_user_option(name)
1822
        if location == '':
1823
            location = None
1824
        return location
1825
1826
    @needs_write_lock
1827
    def _set_parent_location(self, url):
1828
        """Set the parent branch"""
1829
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
1830
1831
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1832
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
1833
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1834
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
1835
1836
    def set_push_location(self, location):
1837
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1838
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
1839
1840
    def set_bound_location(self, location):
1841
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
1842
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1843
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
1844
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1845
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
1846
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1847
            else:
1848
                config.set_user_option('bound', 'False')
1849
                return True
1850
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1851
            self._set_config_location('bound_location', location,
1852
                                      config=config)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1853
            config.set_user_option('bound', 'True')
1854
        return True
1855
1856
    def _get_bound_location(self, bound):
1857
        """Return the bound location in the config file.
1858
1859
        Return None if the bound parameter does not match"""
1860
        config = self.get_config()
1861
        config_bound = (config.get_user_option('bound') == 'True')
1862
        if config_bound != bound:
1863
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1864
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
1865
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1866
    def get_bound_location(self):
1867
        """See Branch.set_push_location."""
1868
        return self._get_bound_location(True)
1869
1870
    def get_old_bound_location(self):
1871
        """See Branch.get_old_bound_location"""
1872
        return self._get_bound_location(False)
1873
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1874
    def set_append_revisions_only(self, enabled):
1875
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
1876
            value = 'True'
1877
        else:
1878
            value = 'False'
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1879
        self.get_config().set_user_option('append_revisions_only', value)
2230.3.32 by Aaron Bentley
Implement strict history policy
1880
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1881
    def _get_append_revisions_only(self):
1882
        value = self.get_config().get_user_option('append_revisions_only')
1883
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
1884
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
1885
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1886
        """Synchronize last revision and revision history between branches.
1887
1888
        This version is most efficient when the destination is also a
1889
        BzrBranch6, but works for BzrBranch5, as long as the destination's
1890
        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
1891
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1892
1893
        :param destination: The branch to copy the history into
1894
        :param revision_id: The revision-id to truncate history at.  May
1895
          be None to copy complete history.
1896
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
1897
        if revision_id is None:
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1898
            revno, revision_id = self.last_revision_info()
1899
        else:
1900
            revno = self.revision_id_to_revno(revision_id)
1901
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1902
2230.3.34 by Aaron Bentley
cleanup
1903
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1904
class BranchTestProviderAdapter(object):
1905
    """A tool to generate a suite testing multiple branch formats at once.
1906
1907
    This is done by copying the test once for each transport and injecting
1908
    the transport_server, transport_readonly_server, and branch_format
1909
    classes into each copy. Each copy is also given a new id() to make it
1910
    easy to identify.
1911
    """
1912
1913
    def __init__(self, transport_server, transport_readonly_server, formats):
1914
        self._transport_server = transport_server
1915
        self._transport_readonly_server = transport_readonly_server
1916
        self._formats = formats
1917
    
1918
    def adapt(self, test):
1919
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1920
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1921
            new_test = deepcopy(test)
1922
            new_test.transport_server = self._transport_server
1923
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1924
            new_test.bzrdir_format = bzrdir_format
1925
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1926
            def make_new_test_id():
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1927
                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.
1928
                return lambda: new_id
1929
            new_test.id = make_new_test_id()
1930
            result.addTest(new_test)
1931
        return result
1932
1933
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1934
class BranchCheckResult(object):
1935
    """Results of checking branch consistency.
1936
1937
    :see: Branch.check
1938
    """
1939
1940
    def __init__(self, branch):
1941
        self.branch = branch
1942
1943
    def report_results(self, verbose):
1944
        """Report the check results via trace.note.
1945
        
1946
        :param verbose: Requests more detailed display of what was checked,
1947
            if any.
1948
        """
1949
        note('checked branch %s format %s',
1950
             self.branch.base,
1951
             self.branch._format)
1952
1953
1 by mbp at sourcefrog
import from baz patch-364
1954
######################################################################
1955
# predicates
1956
1957
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1958
@deprecated_function(zero_eight)
1959
def is_control_file(*args, **kwargs):
1960
    """See bzrlib.workingtree.is_control_file."""
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1961
    from bzrlib import workingtree
1962
    return workingtree.is_control_file(*args, **kwargs)
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
1963
1964
1965
class Converter5to6(object):
1966
    """Perform an in-place upgrade of format 5 to format 6"""
1967
1968
    def convert(self, branch):
1969
        # Data for 5 and 6 can peacefully coexist.
1970
        format = BzrBranchFormat6()
1971
        new_branch = format.open(branch.bzrdir, _found=True)
1972
1973
        # Copy source data into target
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1974
        new_branch.set_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
1975
        new_branch.set_parent(branch.get_parent())
1976
        new_branch.set_bound_location(branch.get_bound_location())
1977
        new_branch.set_push_location(branch.get_push_location())
1978
1979
        # Copying done; now update target format
1980
        new_branch.control_files.put_utf8('format',
1981
            format.get_format_string())
1982
1983
        # Clean up old files
1984
        new_branch.control_files._transport.delete('revision-history')
1985
        try:
1986
            branch.set_parent(None)
1987
        except NoSuchFile:
1988
            pass
1989
        branch.set_bound_location(None)