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