/brz/remove-bazaar

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