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