/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
1
# Copyright (C) 2005-2011 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
6207.3.11 by Jelmer Vernooij
Make sure bzrlib.bzrdir is imported.
17
import bzrlib.bzrdir
1 by mbp at sourcefrog
import from baz patch-364
18
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
19
from cStringIO import StringIO
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
20
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
23
import itertools
1551.8.4 by Aaron Bentley
Tweak import style
24
from bzrlib import (
6207.3.3 by jelmer at samba
Fix tests and the like.
25
    bzrdir,
26
    controldir,
27
    cache_utf8,
28
    cleanup,
29
    config as _mod_config,
30
    debug,
31
    errors,
32
    fetch,
33
    graph as _mod_graph,
34
    lockdir,
35
    lockable_files,
36
    remote,
37
    repository,
38
    revision as _mod_revision,
39
    rio,
40
    tag as _mod_tag,
41
    transport,
42
    ui,
43
    urlutils,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
44
    vf_search,
6207.3.3 by jelmer at samba
Fix tests and the like.
45
    )
6143.1.4 by Jonathan Riddell
update tests
46
from bzrlib.i18n import gettext, ngettext
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
47
""")
48
5697.2.1 by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave.
49
from bzrlib import (
50
    controldir,
51
    )
52
from bzrlib.decorators import (
53
    needs_read_lock,
54
    needs_write_lock,
55
    only_raises,
56
    )
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
57
from bzrlib.hooks import Hooks
3978.3.2 by Jelmer Vernooij
Move most of push to IterGenericBranchBzrDir.
58
from bzrlib.inter import InterObject
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
59
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
60
from bzrlib import registry
3407.2.11 by Martin Pool
Deprecate Branch.abspath
61
from bzrlib.symbol_versioning import (
62
    deprecated_in,
63
    deprecated_method,
64
    )
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
65
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
1104 by Martin Pool
- Add a simple UIFactory
66
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
67
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
68
class Branch(controldir.ControlComponent):
1 by mbp at sourcefrog
import from baz patch-364
69
    """Branch holding a history of revisions.
70
5158.6.2 by Martin Pool
Branch provides user_url etc
71
    :ivar base:
72
        Base directory/url of the branch; using control_url and
73
        control_transport is more standardized.
5609.25.6 by Andrew Bennetts
Docstring tweaks.
74
    :ivar hooks: An instance of BranchHooks.
75
    :ivar _master_branch_cache: cached result of get_master_branch, see
76
        _clear_cached_state.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
77
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
78
    # this is really an instance variable - FIXME move it there
79
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
80
    base = None
81
5158.6.2 by Martin Pool
Branch provides user_url etc
82
    @property
83
    def control_transport(self):
84
        return self._transport
85
86
    @property
87
    def user_transport(self):
88
        return self.bzrdir.user_transport
89
6305.3.2 by Jelmer Vernooij
Only make a single connection.
90
    def __init__(self, possible_transports=None):
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
91
        self.tags = self._format.make_tags(self)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
92
        self._revision_history_cache = None
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
93
        self._revision_id_to_revno_cache = None
3949.2.6 by Ian Clatworthy
review feedback from jam
94
        self._partial_revision_id_to_revno_cache = {}
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
95
        self._partial_revision_history_cache = []
5535.2.1 by Andrew Bennetts
Cache a branch's tags during a read-lock.
96
        self._tags_bytes = None
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
97
        self._last_revision_info_cache = None
5609.25.3 by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock.
98
        self._master_branch_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
99
        self._merge_sorted_revisions_cache = None
6305.3.2 by Jelmer Vernooij
Only make a single connection.
100
        self._open_hook(possible_transports)
3681.1.1 by Robert Collins
Create a new hook Branch.open. (Robert Collins)
101
        hooks = Branch.hooks['open']
102
        for hook in hooks:
103
            hook(self)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
104
6305.3.2 by Jelmer Vernooij
Only make a single connection.
105
    def _open_hook(self, possible_transports):
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
106
        """Called by init to allow simpler extension of the base class."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
107
6305.3.2 by Jelmer Vernooij
Only make a single connection.
108
    def _activate_fallback_location(self, url, possible_transports):
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
109
        """Activate the branch/repository from url as a fallback repository."""
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
110
        for existing_fallback_repo in self.repository._fallback_repositories:
111
            if existing_fallback_repo.user_url == url:
112
                # This fallback is already configured.  This probably only
6207.3.3 by jelmer at samba
Fix tests and the like.
113
                # happens because ControlDir.sprout is a horrible mess.  To avoid
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
114
                # confusing _unstack we don't add this a second time.
5536.1.9 by Andrew Bennetts
Do as the XXX and John's review suggest: log a warning about duplicate fallback activation.
115
                mutter('duplicate activation of fallback %r on %r', url, self)
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
116
                return
6305.3.2 by Jelmer Vernooij
Only make a single connection.
117
        repo = self._get_fallback_repository(url, possible_transports)
4462.3.2 by Robert Collins
Do not stack on the same branch/repository anymore. This was never supported and would generally result in infinite recursion. Fixes bug 376243.
118
        if repo.has_same_location(self.repository):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
119
            raise errors.UnstackableLocationError(self.user_url, url)
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
120
        self.repository.add_fallback_repository(repo)
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
121
1687.1.8 by Robert Collins
Teach Branch about break_lock.
122
    def break_lock(self):
123
        """Break a lock if one is present from another instance.
124
125
        Uses the ui factory to ask for confirmation if the lock may be from
126
        an active process.
127
128
        This will probe the repository for its lock as well.
129
        """
130
        self.control_files.break_lock()
131
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
132
        master = self.get_master_branch()
133
        if master is not None:
134
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
135
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
136
    def _check_stackable_repo(self):
137
        if not self.repository._format.supports_external_lookups:
138
            raise errors.UnstackableRepositoryFormat(self.repository._format,
139
                self.repository.base)
140
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
141
    def _extend_partial_history(self, stop_index=None, stop_revision=None):
142
        """Extend the partial history to include a given index
143
144
        If a stop_index is supplied, stop when that index has been reached.
145
        If a stop_revision is supplied, stop when that revision is
146
        encountered.  Otherwise, stop when the beginning of history is
147
        reached.
148
149
        :param stop_index: The index which should be present.  When it is
150
            present, history extension will stop.
4419.2.3 by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch.
151
        :param stop_revision: The revision id which should be present.  When
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
152
            it is encountered, history extension will stop.
153
        """
154
        if len(self._partial_revision_history_cache) == 0:
4419.2.3 by Andrew Bennetts
Refactor _extend_partial_history into a standalone function that can be used without a branch.
155
            self._partial_revision_history_cache = [self.last_revision()]
156
        repository._iter_for_revno(
157
            self.repository, self._partial_revision_history_cache,
158
            stop_index=stop_index, stop_revision=stop_revision)
159
        if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
160
            self._partial_revision_history_cache.pop()
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
161
4332.3.5 by Robert Collins
Add Branch._get_check_refs.
162
    def _get_check_refs(self):
163
        """Get the references needed for check().
164
165
        See bzrlib.check.
166
        """
167
        revid = self.last_revision()
168
        return [('revision-existence', revid), ('lefthand-distance', revid)]
169
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
170
    @staticmethod
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
171
    def open(base, _unsupported=False, possible_transports=None):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
172
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
173
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
174
        For instance, if the branch is at URL/.bzr/branch,
175
        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.
176
        """
6207.3.3 by jelmer at samba
Fix tests and the like.
177
        control = controldir.ControlDir.open(base, _unsupported,
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
178
                                     possible_transports=possible_transports)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
179
        return control.open_branch(unsupported=_unsupported,
180
            possible_transports=possible_transports)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
181
182
    @staticmethod
6305.3.2 by Jelmer Vernooij
Only make a single connection.
183
    def open_from_transport(transport, name=None, _unsupported=False,
184
            possible_transports=None):
2485.8.35 by Vincent Ladeuil
Fix pull multiple connections.
185
        """Open the branch rooted at transport"""
6207.3.3 by jelmer at samba
Fix tests and the like.
186
        control = controldir.ControlDir.open_from_transport(transport, _unsupported)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
187
        return control.open_branch(name=name, unsupported=_unsupported,
188
            possible_transports=possible_transports)
2485.8.35 by Vincent Ladeuil
Fix pull multiple connections.
189
190
    @staticmethod
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
191
    def open_containing(url, possible_transports=None):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
192
        """Open an existing branch which contains url.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
193
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
194
        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
195
196
        Basically we keep looking up until we find the control directory or
197
        run into the root.  If there isn't one, raises NotBranchError.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
198
        If there is one and it is either an unrecognised format or an unsupported
1534.4.22 by Robert Collins
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch.
199
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
200
        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.
201
        """
6207.3.3 by jelmer at samba
Fix tests and the like.
202
        control, relpath = controldir.ControlDir.open_containing(url,
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
203
                                                         possible_transports)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
204
        branch = control.open_branch(possible_transports=possible_transports)
205
        return (branch, relpath)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
206
4032.3.5 by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch.
207
    def _push_should_merge_tags(self):
208
        """Should _basic_push merge this branch's tags into the target?
209
210
        The default implementation returns False if this branch has no tags,
211
        and True the rest of the time.  Subclasses may override this.
212
        """
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
213
        return self.supports_tags() and self.tags.get_tag_dict()
4032.3.5 by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch.
214
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
215
    def get_config(self):
5284.3.1 by Robert Collins
Document bzrlib.branch.Branch.get_config.
216
        """Get a bzrlib.config.BranchConfig for this Branch.
217
218
        This can then be used to get and set configuration options for the
219
        branch.
220
221
        :return: A bzrlib.config.BranchConfig.
222
        """
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
223
        return _mod_config.BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
224
6155.2.1 by Vincent Ladeuil
Migrate dpush_strict, push_strict and send_strict options to the stack based config design, introducing get_config_stack for branches.
225
    def get_config_stack(self):
226
        """Get a bzrlib.config.BranchStack for this Branch.
227
228
        This can then be used to get and set configuration options for the
229
        branch.
230
231
        :return: A bzrlib.config.BranchStack.
232
        """
233
        return _mod_config.BranchStack(self)
234
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
235
    def _get_config(self):
236
        """Get the concrete config for just the config in this branch.
237
238
        This is not intended for client use; see Branch.get_config for the
239
        public API.
240
241
        Added in 1.14.
242
243
        :return: An object supporting get_option and set_option.
244
        """
245
        raise NotImplementedError(self._get_config)
246
6305.3.2 by Jelmer Vernooij
Only make a single connection.
247
    def _get_fallback_repository(self, url, possible_transports):
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
248
        """Get the repository we fallback to at url."""
249
        url = urlutils.join(self.base, url)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
250
        a_branch = Branch.open(url, possible_transports=possible_transports)
5051.3.14 by Jelmer Vernooij
Remove use of BzrDir.open_branch() without arguments.
251
        return a_branch.repository
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
252
5535.2.1 by Andrew Bennetts
Cache a branch's tags during a read-lock.
253
    @needs_read_lock
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
254
    def _get_tags_bytes(self):
255
        """Get the bytes of a serialised tags dict.
256
257
        Note that not all branches support tags, nor do all use the same tags
258
        logic: this method is specific to BasicTags. Other tag implementations
259
        may use the same method name and behave differently, safely, because
260
        of the double-dispatch via
261
        format.make_tags->tags_instance->get_tags_dict.
262
263
        :return: The bytes of the tags file.
264
        :seealso: Branch._set_tags_bytes.
265
        """
5535.2.1 by Andrew Bennetts
Cache a branch's tags during a read-lock.
266
        if self._tags_bytes is None:
267
            self._tags_bytes = self._transport.get_bytes('tags')
268
        return self._tags_bytes
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
269
3815.3.4 by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch.
270
    def _get_nick(self, local=False, possible_transports=None):
3565.6.7 by Marius Kruger
* checkouts now use master nick when no explicit nick is set.
271
        config = self.get_config()
3815.3.4 by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch.
272
        # explicit overrides master, but don't look for master if local is True
273
        if not local and not config.has_explicit_nickname():
3565.6.10 by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable
274
            try:
275
                master = self.get_master_branch(possible_transports)
5050.7.4 by Parth Malwankar
fixed recursion detection to handle shared repos
276
                if master and self.user_url == master.user_url:
5050.7.5 by Parth Malwankar
better error message for RecursiveBind
277
                    raise errors.RecursiveBind(self.user_url)
3565.6.10 by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable
278
                if master is not None:
279
                    # return the master branch value
3815.3.3 by Marius Kruger
apply Martin's fix for #293440
280
                    return master.nick
5050.7.2 by Parth Malwankar
recursive binding now shows a clear error
281
            except errors.RecursiveBind, e:
282
                raise e
3565.6.10 by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable
283
            except errors.BzrError, e:
284
                # Silently fall back to local implicit nick if the master is
285
                # unavailable
286
                mutter("Could not connect to bound branch, "
287
                    "falling back to local nick.\n " + str(e))
3565.6.7 by Marius Kruger
* checkouts now use master nick when no explicit nick is set.
288
        return config.get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
289
290
    def _set_nick(self, nick):
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
291
        self.get_config().set_user_option('nickname', nick, warn_masked=True)
1185.35.11 by Aaron Bentley
Added support for branch nicks
292
293
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
294
295
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
296
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
297
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
298
    def _lefthand_history(self, revision_id, last_rev=None,
299
                          other_branch=None):
300
        if 'evil' in debug.debug_flags:
301
            mutter_callsite(4, "_lefthand_history scales with history.")
302
        # stop_revision must be a descendant of last_revision
303
        graph = self.repository.get_graph()
304
        if last_rev is not None:
305
            if not graph.is_ancestor(last_rev, revision_id):
306
                # our previous tip is not merged into stop_revision
307
                raise errors.DivergedBranches(self, other_branch)
308
        # make a new revision history from the graph
309
        parents_map = graph.get_parent_map([revision_id])
310
        if revision_id not in parents_map:
311
            raise errors.NoSuchRevision(self, revision_id)
312
        current_rev_id = revision_id
313
        new_history = []
314
        check_not_reserved_id = _mod_revision.check_not_reserved_id
315
        # Do not include ghosts or graph origin in revision_history
316
        while (current_rev_id in parents_map and
317
               len(parents_map[current_rev_id]) > 0):
318
            check_not_reserved_id(current_rev_id)
319
            new_history.append(current_rev_id)
320
            current_rev_id = parents_map[current_rev_id][0]
321
            parents_map = graph.get_parent_map([current_rev_id])
322
        new_history.reverse()
323
        return new_history
324
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
325
    def lock_write(self, token=None):
326
        """Lock the branch for write operations.
327
328
        :param token: A token to permit reacquiring a previously held and
329
            preserved lock.
330
        :return: A BranchWriteLockResult.
331
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
332
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
333
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
334
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
335
        """Lock the branch for read operations.
336
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
337
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
338
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
339
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
340
341
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
342
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
343
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
344
    def peek_lock_mode(self):
345
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
346
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
347
1694.2.6 by Martin Pool
[merge] bzr.dev
348
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
349
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
350
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
351
    @needs_read_lock
3949.2.6 by Ian Clatworthy
review feedback from jam
352
    def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
353
        """Return the revision_id for a dotted revno.
354
355
        :param revno: a tuple like (1,) or (1,1,2)
3949.2.4 by Ian Clatworthy
add top level revno cache
356
        :param _cache_reverse: a private parameter enabling storage
357
           of the reverse mapping in a top level cache. (This should
358
           only be done in selective circumstances as we want to
359
           avoid having the mapping cached multiple times.)
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
360
        :return: the revision_id
361
        :raises errors.NoSuchRevision: if the revno doesn't exist
362
        """
3949.2.6 by Ian Clatworthy
review feedback from jam
363
        rev_id = self._do_dotted_revno_to_revision_id(revno)
364
        if _cache_reverse:
365
            self._partial_revision_id_to_revno_cache[rev_id] = revno
3949.2.4 by Ian Clatworthy
add top level revno cache
366
        return rev_id
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
367
3949.2.6 by Ian Clatworthy
review feedback from jam
368
    def _do_dotted_revno_to_revision_id(self, revno):
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
369
        """Worker function for dotted_revno_to_revision_id.
370
371
        Subclasses should override this if they wish to
372
        provide a more efficient implementation.
373
        """
374
        if len(revno) == 1:
375
            return self.get_rev_id(revno[0])
376
        revision_id_to_revno = self.get_revision_id_to_revno_map()
3949.2.6 by Ian Clatworthy
review feedback from jam
377
        revision_ids = [revision_id for revision_id, this_revno
378
                        in revision_id_to_revno.iteritems()
379
                        if revno == this_revno]
380
        if len(revision_ids) == 1:
381
            return revision_ids[0]
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
382
        else:
383
            revno_str = '.'.join(map(str, revno))
384
            raise errors.NoSuchRevision(self, revno_str)
385
386
    @needs_read_lock
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
387
    def revision_id_to_dotted_revno(self, revision_id):
388
        """Given a revision id, return its dotted revno.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
389
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
390
        :return: a tuple like (1,) or (400,1,3).
391
        """
3949.2.6 by Ian Clatworthy
review feedback from jam
392
        return self._do_revision_id_to_dotted_revno(revision_id)
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
393
3949.2.6 by Ian Clatworthy
review feedback from jam
394
    def _do_revision_id_to_dotted_revno(self, revision_id):
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
395
        """Worker function for revision_id_to_revno."""
3949.2.4 by Ian Clatworthy
add top level revno cache
396
        # Try the caches if they are loaded
3949.2.6 by Ian Clatworthy
review feedback from jam
397
        result = self._partial_revision_id_to_revno_cache.get(revision_id)
398
        if result is not None:
399
            return result
400
        if self._revision_id_to_revno_cache:
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
401
            result = self._revision_id_to_revno_cache.get(revision_id)
3949.2.6 by Ian Clatworthy
review feedback from jam
402
            if result is None:
403
                raise errors.NoSuchRevision(self, revision_id)
404
        # Try the mainline as it's optimised
405
        try:
406
            revno = self.revision_id_to_revno(revision_id)
407
            return (revno,)
408
        except errors.NoSuchRevision:
409
            # We need to load and use the full revno map after all
410
            result = self.get_revision_id_to_revno_map().get(revision_id)
411
            if result is None:
412
                raise errors.NoSuchRevision(self, revision_id)
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
413
        return result
414
3949.2.7 by Ian Clatworthy
fix accidental needs_read_lock removal
415
    @needs_read_lock
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
416
    def get_revision_id_to_revno_map(self):
417
        """Return the revision_id => dotted revno map.
418
419
        This will be regenerated on demand, but will be cached.
420
421
        :return: A dictionary mapping revision_id => dotted revno.
422
            This dictionary should not be modified by the caller.
423
        """
424
        if self._revision_id_to_revno_cache is not None:
425
            mapping = self._revision_id_to_revno_cache
426
        else:
427
            mapping = self._gen_revno_map()
428
            self._cache_revision_id_to_revno(mapping)
429
        # TODO: jam 20070417 Since this is being cached, should we be returning
430
        #       a copy?
431
        # I would rather not, and instead just declare that users should not
432
        # modify the return value.
433
        return mapping
434
435
    def _gen_revno_map(self):
436
        """Create a new mapping from revision ids to dotted revnos.
437
438
        Dotted revnos are generated based on the current tip in the revision
439
        history.
440
        This is the worker function for get_revision_id_to_revno_map, which
441
        just caches the return value.
442
443
        :return: A dictionary mapping revision_id => dotted revno.
444
        """
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
445
        revision_id_to_revno = dict((rev_id, revno)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
446
            for rev_id, depth, revno, end_of_merge
447
             in self.iter_merge_sorted_revisions())
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
448
        return revision_id_to_revno
449
450
    @needs_read_lock
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
451
    def iter_merge_sorted_revisions(self, start_revision_id=None,
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
452
            stop_revision_id=None, stop_rule='exclude', direction='reverse'):
3949.3.2 by Ian Clatworthy
feedback from jam
453
        """Walk the revisions for a branch in merge sorted order.
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
454
3949.3.8 by Ian Clatworthy
feedback from poolie
455
        Merge sorted order is the output from a merge-aware,
456
        topological sort, i.e. all parents come before their
457
        children going forward; the opposite for reverse.
458
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
459
        :param start_revision_id: the revision_id to begin walking from.
460
            If None, the branch tip is used.
461
        :param stop_revision_id: the revision_id to terminate the walk
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
462
            after. If None, the rest of history is included.
463
        :param stop_rule: if stop_revision_id is not None, the precise rule
464
            to use for termination:
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
465
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
466
            * 'exclude' - leave the stop revision out of the result (default)
467
            * 'include' - the stop revision is the last item in the result
468
            * 'with-merges' - include the stop revision and all of its
469
              merged revisions in the result
5155.1.5 by Vincent Ladeuil
Fixed as per Andrew's review.
470
            * 'with-merges-without-common-ancestry' - filter out revisions 
471
              that are in both ancestries
3949.3.3 by Ian Clatworthy
simplify the meaning of forward to be appropriate to this layer
472
        :param direction: either 'reverse' or 'forward':
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
473
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
474
            * reverse means return the start_revision_id first, i.e.
475
              start at the most recent revision and go backwards in history
3949.3.3 by Ian Clatworthy
simplify the meaning of forward to be appropriate to this layer
476
            * forward returns tuples in the opposite order to reverse.
477
              Note in particular that forward does *not* do any intelligent
478
              ordering w.r.t. depth as some clients of this API may like.
3949.3.8 by Ian Clatworthy
feedback from poolie
479
              (If required, that ought to be done at higher layers.)
480
481
        :return: an iterator over (revision_id, depth, revno, end_of_merge)
482
            tuples where:
483
484
            * revision_id: the unique id of the revision
485
            * depth: How many levels of merging deep this node has been
486
              found.
487
            * revno_sequence: This field provides a sequence of
488
              revision numbers for all revisions. The format is:
489
              (REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
490
              branch that the revno is on. From left to right the REVNO numbers
491
              are the sequence numbers within that branch of the revision.
492
            * end_of_merge: When True the next node (earlier in history) is
493
              part of a different merge.
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
494
        """
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
495
        # Note: depth and revno values are in the context of the branch so
496
        # we need the full graph to get stable numbers, regardless of the
497
        # start_revision_id.
498
        if self._merge_sorted_revisions_cache is None:
499
            last_revision = self.last_revision()
4913.4.2 by Jelmer Vernooij
Add Repository.get_known_graph_ancestry.
500
            known_graph = self.repository.get_known_graph_ancestry(
501
                [last_revision])
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
502
            self._merge_sorted_revisions_cache = known_graph.merge_sort(
4913.4.2 by Jelmer Vernooij
Add Repository.get_known_graph_ancestry.
503
                last_revision)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
504
        filtered = self._filter_merge_sorted_revisions(
505
            self._merge_sorted_revisions_cache, start_revision_id,
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
506
            stop_revision_id, stop_rule)
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
507
        # Make sure we don't return revisions that are not part of the
508
        # start_revision_id ancestry.
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
509
        filtered = self._filter_start_non_ancestors(filtered)
3949.3.2 by Ian Clatworthy
feedback from jam
510
        if direction == 'reverse':
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
511
            return filtered
3949.3.2 by Ian Clatworthy
feedback from jam
512
        if direction == 'forward':
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
513
            return reversed(list(filtered))
3949.3.2 by Ian Clatworthy
feedback from jam
514
        else:
515
            raise ValueError('invalid direction %r' % direction)
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
516
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
517
    def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
518
        start_revision_id, stop_revision_id, stop_rule):
3949.3.7 by Ian Clatworthy
drop seqnum from in-memory cache
519
        """Iterate over an inclusive range of sorted revisions."""
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
520
        rev_iter = iter(merge_sorted_revisions)
521
        if start_revision_id is not None:
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
522
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
523
                rev_id = node.key
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
524
                if rev_id != start_revision_id:
525
                    continue
526
                else:
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
527
                    # The decision to include the start or not
528
                    # depends on the stop_rule if a stop is provided
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
529
                    # so pop this node back into the iterator
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
530
                    rev_iter = itertools.chain(iter([node]), rev_iter)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
531
                    break
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
532
        if stop_revision_id is None:
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
533
            # Yield everything
534
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
535
                rev_id = node.key
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
536
                yield (rev_id, node.merge_depth, node.revno,
537
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
538
        elif stop_rule == 'exclude':
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
539
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
540
                rev_id = node.key
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
541
                if rev_id == stop_revision_id:
542
                    return
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
543
                yield (rev_id, node.merge_depth, node.revno,
544
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
545
        elif stop_rule == 'include':
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
546
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
547
                rev_id = node.key
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
548
                yield (rev_id, node.merge_depth, node.revno,
549
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
550
                if rev_id == stop_revision_id:
551
                    return
5097.1.11 by Vincent Ladeuil
Fix bug #320119 in a crude way.
552
        elif stop_rule == 'with-merges-without-common-ancestry':
553
            # We want to exclude all revisions that are already part of the
554
            # stop_revision_id ancestry.
555
            graph = self.repository.get_graph()
5155.1.3 by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once.
556
            ancestors = graph.find_unique_ancestors(start_revision_id,
557
                                                    [stop_revision_id])
5097.1.11 by Vincent Ladeuil
Fix bug #320119 in a crude way.
558
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
559
                rev_id = node.key
5155.1.3 by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once.
560
                if rev_id not in ancestors:
5097.1.11 by Vincent Ladeuil
Fix bug #320119 in a crude way.
561
                    continue
562
                yield (rev_id, node.merge_depth, node.revno,
563
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
564
        elif stop_rule == 'with-merges':
3960.3.4 by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth
565
            stop_rev = self.repository.get_revision(stop_revision_id)
566
            if stop_rev.parent_ids:
4511.3.15 by Marius Kruger
mainline_stop_rev -> left_parent
567
                left_parent = stop_rev.parent_ids[0]
3960.3.4 by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth
568
            else:
4511.3.15 by Marius Kruger
mainline_stop_rev -> left_parent
569
                left_parent = _mod_revision.NULL_REVISION
570
            # left_parent is the actual revision we want to stop logging at,
571
            # since we want to show the merged revisions after the stop_rev too
4511.3.10 by Marius Kruger
log -n0 should log up until the stop_revision with its meges and no further.
572
            reached_stop_revision_id = False
4511.3.12 by Marius Kruger
ununinvert logic and improve some variable names.
573
            revision_id_whitelist = []
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
574
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
575
                rev_id = node.key
4511.3.15 by Marius Kruger
mainline_stop_rev -> left_parent
576
                if rev_id == left_parent:
577
                    # reached the left parent after the stop_revision
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
578
                    return
4511.3.12 by Marius Kruger
ununinvert logic and improve some variable names.
579
                if (not reached_stop_revision_id or
580
                        rev_id in revision_id_whitelist):
4511.3.10 by Marius Kruger
log -n0 should log up until the stop_revision with its meges and no further.
581
                    yield (rev_id, node.merge_depth, node.revno,
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
582
                       node.end_of_merge)
4511.3.10 by Marius Kruger
log -n0 should log up until the stop_revision with its meges and no further.
583
                    if reached_stop_revision_id or rev_id == stop_revision_id:
584
                        # only do the merged revs of rev_id from now on
585
                        rev = self.repository.get_revision(rev_id)
586
                        if rev.parent_ids:
587
                            reached_stop_revision_id = True
4511.3.12 by Marius Kruger
ununinvert logic and improve some variable names.
588
                            revision_id_whitelist.extend(rev.parent_ids)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
589
        else:
590
            raise ValueError('invalid stop_rule %r' % stop_rule)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
591
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
592
    def _filter_start_non_ancestors(self, rev_iter):
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
593
        # If we started from a dotted revno, we want to consider it as a tip
594
        # and don't want to yield revisions that are not part of its
595
        # ancestry. Given the order guaranteed by the merge sort, we will see
596
        # uninteresting descendants of the first parent of our tip before the
597
        # tip itself.
598
        first = rev_iter.next()
599
        (rev_id, merge_depth, revno, end_of_merge) = first
600
        yield first
601
        if not merge_depth:
602
            # We start at a mainline revision so by definition, all others
603
            # revisions in rev_iter are ancestors
604
            for node in rev_iter:
605
                yield node
606
5097.2.2 by Vincent Ladeuil
Fix performance.
607
        clean = False
5097.2.1 by Vincent Ladeuil
Fix bug #474807 but performance suffers.
608
        whitelist = set()
5097.2.3 by Vincent Ladeuil
Better performance than before the fix.
609
        pmap = self.repository.get_parent_map([rev_id])
610
        parents = pmap.get(rev_id, [])
611
        if parents:
612
            whitelist.update(parents)
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
613
        else:
5097.1.8 by Vincent Ladeuil
Remove the comment about the missing test (it's not worth it at the
614
            # If there is no parents, there is nothing of interest left
615
616
            # FIXME: It's hard to test this scenario here as this code is never
617
            # called in that case. -- vila 20100322
618
            return
619
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
620
        for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
5097.2.2 by Vincent Ladeuil
Fix performance.
621
            if not clean:
622
                if rev_id in whitelist:
5097.2.3 by Vincent Ladeuil
Better performance than before the fix.
623
                    pmap = self.repository.get_parent_map([rev_id])
624
                    parents = pmap.get(rev_id, [])
5097.2.2 by Vincent Ladeuil
Fix performance.
625
                    whitelist.remove(rev_id)
5097.2.3 by Vincent Ladeuil
Better performance than before the fix.
626
                    whitelist.update(parents)
5097.2.2 by Vincent Ladeuil
Fix performance.
627
                    if merge_depth == 0:
628
                        # We've reached the mainline, there is nothing left to
629
                        # filter
630
                        clean = True
631
                else:
632
                    # A revision that is not part of the ancestry of our
633
                    # starting revision.
634
                    continue
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
635
            yield (rev_id, merge_depth, revno, end_of_merge)
636
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
637
    def leave_lock_in_place(self):
638
        """Tell this branch object not to release the physical lock when this
639
        object is unlocked.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
640
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
641
        If lock_write doesn't return a token, then this method is not supported.
642
        """
643
        self.control_files.leave_in_place()
644
645
    def dont_leave_lock_in_place(self):
646
        """Tell this branch object to release the physical lock when this
647
        object is unlocked, even if it didn't originally acquire it.
648
649
        If lock_write doesn't return a token, then this method is not supported.
650
        """
651
        self.control_files.dont_leave_in_place()
652
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
653
    def bind(self, other):
654
        """Bind the local branch the other branch.
655
656
        :param other: The branch to bind to
657
        :type other: Branch
658
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
659
        raise errors.UpgradeRequired(self.user_url)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
660
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
661
    def get_append_revisions_only(self):
662
        """Whether it is only possible to append revisions to the history.
663
        """
6123.9.14 by Jelmer Vernooij
Fix RemoteBranch.get_append_revisions_only().
664
        if not self._format.supports_set_append_revisions_only():
665
            return False
666
        return self.get_config(
667
            ).get_user_option_as_bool('append_revisions_only')
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
668
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
669
    def set_append_revisions_only(self, enabled):
670
        if not self._format.supports_set_append_revisions_only():
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
671
            raise errors.UpgradeRequired(self.user_url)
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
672
        if enabled:
673
            value = 'True'
674
        else:
675
            value = 'False'
676
        self.get_config().set_user_option('append_revisions_only', value,
677
            warn_masked=True)
678
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
679
    def set_reference_info(self, file_id, tree_path, branch_location):
680
        """Set the branch location to use for a tree reference."""
681
        raise errors.UnsupportedOperation(self.set_reference_info, self)
682
683
    def get_reference_info(self, file_id):
684
        """Get the tree_path and branch_location for a tree reference."""
685
        raise errors.UnsupportedOperation(self.get_reference_info, self)
686
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.
687
    @needs_write_lock
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
688
    def fetch(self, from_branch, last_revision=None, limit=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.
689
        """Copy revisions from from_branch into this branch.
690
691
        :param from_branch: Where to copy from.
692
        :param last_revision: What revision to stop at (None for at the end
693
                              of the branch.
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
694
        :param limit: Optional rough limit of revisions to fetch
4065.1.1 by Robert Collins
Change the return value of fetch() to None.
695
        :return: 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.
696
        """
5852.1.4 by Jelmer Vernooij
Pass along limit=.
697
        return InterBranch.get(from_branch, self).fetch(last_revision, limit=limit)
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.
698
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
699
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
700
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
701
702
        Older format branches cannot bind, please be sure to use a metadir
703
        branch.
704
        """
705
        return None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
706
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
707
    def get_old_bound_location(self):
708
        """Return the URL of the branch we used to be bound to
709
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
710
        raise errors.UpgradeRequired(self.user_url)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
711
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
712
    def get_commit_builder(self, parents, config=None, timestamp=None,
713
                           timezone=None, committer=None, revprops=None,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
714
                           revision_id=None, lossy=False):
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
715
        """Obtain a CommitBuilder for this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
716
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
717
        :param parents: Revision ids of the parents of the new revision.
718
        :param config: Optional configuration to use.
719
        :param timestamp: Optional timestamp recorded for commit.
720
        :param timezone: Optional timezone for timestamp.
721
        :param committer: Optional committer to set for commit.
722
        :param revprops: Optional dictionary of revision properties.
723
        :param revision_id: Optional revision id.
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
724
        :param lossy: Whether to discard data that can not be natively
725
            represented, when pushing to a foreign VCS 
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
726
        """
727
728
        if config is None:
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
729
            config = self.get_config()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
730
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
731
        return self.repository.get_commit_builder(self, parents, config,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
732
            timestamp, timezone, committer, revprops, revision_id,
733
            lossy)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
734
2810.2.1 by Martin Pool
merge vincent and cleanup
735
    def get_master_branch(self, possible_transports=None):
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
736
        """Return the branch we are bound to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
737
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
738
        :return: Either a Branch, or None
739
        """
740
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
741
6171.1.1 by Jelmer Vernooij
Deprecate Branch.get_revision_delta.
742
    @deprecated_method(deprecated_in((2, 5, 0)))
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
743
    def get_revision_delta(self, revno):
744
        """Return the delta for one revision.
745
746
        The delta is relative to its mainline predecessor, or the
747
        empty tree for revision 1.
748
        """
6165.4.5 by Jelmer Vernooij
Avoid revision_history call.
749
        try:
6165.2.2 by Jelmer Vernooij
Fix Branch.get_revision_delta.
750
            revid = self.get_rev_id(revno)
6165.4.5 by Jelmer Vernooij
Avoid revision_history call.
751
        except errors.NoSuchRevision:
3236.1.2 by Michael Hudson
clean up branch.py imports
752
            raise errors.InvalidRevisionNumber(revno)
6165.4.5 by Jelmer Vernooij
Avoid revision_history call.
753
        return self.repository.get_revision_delta(revid)
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
754
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
755
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
756
        """Get the URL this branch is stacked against.
757
758
        :raises NotStacked: If the branch is not stacked.
759
        :raises UnstackableBranchFormat: If the branch does not support
760
            stacking.
761
        """
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
762
        raise NotImplementedError(self.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
763
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
764
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
765
        """Print `file` to stdout."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
766
        raise NotImplementedError(self.print_file)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
767
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
768
    @deprecated_method(deprecated_in((2, 4, 0)))
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
769
    def set_revision_history(self, rev_history):
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
770
        """See Branch.set_revision_history."""
5718.8.18 by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls.
771
        self._set_revision_history(rev_history)
772
773
    @needs_write_lock
774
    def _set_revision_history(self, rev_history):
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
775
        if len(rev_history) == 0:
776
            revid = _mod_revision.NULL_REVISION
777
        else:
778
            revid = rev_history[-1]
5718.8.15 by Jelmer Vernooij
Check left hand history in Branch.set_revision_history.
779
        if rev_history != self._lefthand_history(revid):
780
            raise errors.NotLefthandHistory(rev_history)
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
781
        self.set_last_revision_info(len(rev_history), revid)
782
        self._cache_revision_history(rev_history)
5718.8.18 by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls.
783
        for hook in Branch.hooks['set_rh']:
784
            hook(self, rev_history)
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
785
786
    @needs_write_lock
787
    def set_last_revision_info(self, revno, revision_id):
5718.8.3 by Jelmer Vernooij
More branch restructuring.
788
        """Set the last revision of this branch.
789
790
        The caller is responsible for checking that the revno is correct
791
        for this revision id.
792
793
        It may be possible to set the branch last revision to an id not
794
        present in the repository.  However, branches can also be
795
        configured to check constraints on history, in which case this may not
796
        be permitted.
797
        """
5883.1.1 by Jelmer Vernooij
Fix NotImplementedError contents.
798
        raise NotImplementedError(self.set_last_revision_info)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
799
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
800
    @needs_write_lock
5718.8.6 by Jelmer Vernooij
Move generate_revision_history.
801
    def generate_revision_history(self, revision_id, last_rev=None,
802
                                  other_branch=None):
5718.8.18 by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls.
803
        """See Branch.generate_revision_history"""
5718.8.24 by Jelmer Vernooij
Implement generate_revision_history using graph.
804
        graph = self.repository.get_graph()
6015.18.1 by Jelmer Vernooij
Fix entry in known_revnos for generate_revision_history.
805
        (last_revno, last_revid) = self.last_revision_info()
5718.8.24 by Jelmer Vernooij
Implement generate_revision_history using graph.
806
        known_revision_ids = [
6015.18.1 by Jelmer Vernooij
Fix entry in known_revnos for generate_revision_history.
807
            (last_revid, last_revno),
5718.8.24 by Jelmer Vernooij
Implement generate_revision_history using graph.
808
            (_mod_revision.NULL_REVISION, 0),
809
            ]
810
        if last_rev is not None:
811
            if not graph.is_ancestor(last_rev, revision_id):
812
                # our previous tip is not merged into stop_revision
813
                raise errors.DivergedBranches(self, other_branch)
814
        revno = graph.find_distance_to_null(revision_id, known_revision_ids)
5718.8.6 by Jelmer Vernooij
Move generate_revision_history.
815
        self.set_last_revision_info(revno, revision_id)
816
817
    @needs_write_lock
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
818
    def set_parent(self, url):
819
        """See Branch.set_parent."""
820
        # TODO: Maybe delete old location files?
821
        # URLs should never be unicode, even on the local fs,
822
        # FIXUP this and get_parent in a future branch format bump:
823
        # read and rewrite the file. RBC 20060125
824
        if url is not None:
825
            if isinstance(url, unicode):
826
                try:
827
                    url = url.encode('ascii')
828
                except UnicodeEncodeError:
829
                    raise errors.InvalidURL(url,
830
                        "Urls must be 7-bit ascii, "
831
                        "use bzrlib.urlutils.escape")
832
            url = urlutils.relative_url(self.base, url)
833
        self._set_parent_location(url)
834
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
835
    @needs_write_lock
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
836
    def set_stacked_on_url(self, url):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
837
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
838
839
        :raises UnstackableBranchFormat: If the branch does not support
840
            stacking.
841
        :raises UnstackableRepositoryFormat: If the repository does not support
842
            stacking.
843
        """
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
844
        if not self._format.supports_stacking():
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
845
            raise errors.UnstackableBranchFormat(self._format, self.user_url)
4509.3.30 by Martin Pool
doc
846
        # XXX: Changing from one fallback repository to another does not check
847
        # that all the data you need is present in the new fallback.
848
        # Possibly it should.
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
849
        self._check_stackable_repo()
850
        if not url:
851
            try:
4509.3.9 by Martin Pool
Split out Branch._unstack
852
                old_url = self.get_stacked_on_url()
853
            except (errors.NotStacked, errors.UnstackableBranchFormat,
854
                errors.UnstackableRepositoryFormat):
855
                return
856
            self._unstack()
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
857
        else:
6305.3.2 by Jelmer Vernooij
Only make a single connection.
858
            self._activate_fallback_location(url,
859
                possible_transports=[self.bzrdir.root_transport])
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
860
        # write this out after the repository is stacked to avoid setting a
861
        # stacked config that doesn't work.
862
        self._set_config_location('stacked_on_location', url)
863
4509.3.9 by Martin Pool
Split out Branch._unstack
864
    def _unstack(self):
865
        """Change a branch to be unstacked, copying data as needed.
5697.2.1 by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave.
866
4509.3.9 by Martin Pool
Split out Branch._unstack
867
        Don't call this directly, use set_stacked_on_url(None).
868
        """
869
        pb = ui.ui_factory.nested_progress_bar()
870
        try:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
871
            pb.update(gettext("Unstacking"))
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
872
            # The basic approach here is to fetch the tip of the branch,
873
            # including all available ghosts, from the existing stacked
874
            # repository into a new repository object without the fallbacks. 
875
            #
876
            # XXX: See <https://launchpad.net/bugs/397286> - this may not be
877
            # correct for CHKMap repostiories
878
            old_repository = self.repository
879
            if len(old_repository._fallback_repositories) != 1:
4509.3.9 by Martin Pool
Split out Branch._unstack
880
                raise AssertionError("can't cope with fallback repositories "
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
881
                    "of %r (fallbacks: %r)" % (old_repository,
882
                        old_repository._fallback_repositories))
5325.1.3 by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches.
883
            # Open the new repository object.
884
            # Repositories don't offer an interface to remove fallback
885
            # repositories today; take the conceptually simpler option and just
886
            # reopen it.  We reopen it starting from the URL so that we
887
            # get a separate connection for RemoteRepositories and can
888
            # stream from one of them to the other.  This does mean doing
889
            # separate SSH connection setup, but unstacking is not a
890
            # common operation so it's tolerable.
6207.3.3 by jelmer at samba
Fix tests and the like.
891
            new_bzrdir = controldir.ControlDir.open(
892
                self.bzrdir.root_transport.base)
5325.1.3 by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches.
893
            new_repository = new_bzrdir.find_repository()
894
            if new_repository._fallback_repositories:
895
                raise AssertionError("didn't expect %r to have "
896
                    "fallback_repositories"
897
                    % (self.repository,))
5325.1.4 by Andrew Bennetts
Improve comments.
898
            # Replace self.repository with the new repository.
899
            # Do our best to transfer the lock state (i.e. lock-tokens and
5325.1.3 by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches.
900
            # lock count) of self.repository to the new repository.
901
            lock_token = old_repository.lock_write().repository_token
902
            self.repository = new_repository
903
            if isinstance(self, remote.RemoteBranch):
5325.1.4 by Andrew Bennetts
Improve comments.
904
                # Remote branches can have a second reference to the old
905
                # repository that need to be replaced.
5325.1.3 by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches.
906
                if self._real_branch is not None:
907
                    self._real_branch.repository = new_repository
908
            self.repository.lock_write(token=lock_token)
909
            if lock_token is not None:
910
                old_repository.leave_lock_in_place()
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
911
            old_repository.unlock()
5325.1.3 by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches.
912
            if lock_token is not None:
913
                # XXX: self.repository.leave_lock_in_place() before this
914
                # function will not be preserved.  Fortunately that doesn't
5325.1.4 by Andrew Bennetts
Improve comments.
915
                # affect the current default format (2a), and would be a
916
                # corner-case anyway.
5325.1.3 by Andrew Bennetts
Try harder to preserve lock-count in _unstack, and add special-case to replace self._real_branch.repository as well as self.repository for remote branches.
917
                #  - Andrew Bennetts, 2010/06/30
918
                self.repository.dont_leave_lock_in_place()
919
            old_lock_count = 0
920
            while True:
921
                try:
922
                    old_repository.unlock()
923
                except errors.LockNotHeld:
924
                    break
925
                old_lock_count += 1
926
            if old_lock_count == 0:
927
                raise AssertionError(
928
                    'old_repository should have been locked at least once.')
929
            for i in range(old_lock_count-1):
930
                self.repository.lock_write()
931
            # Fetch from the old repository into the new.
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
932
            old_repository.lock_read()
933
            try:
934
                # XXX: If you unstack a branch while it has a working tree
935
                # with a pending merge, the pending-merged revisions will no
936
                # longer be present.  You can (probably) revert and remerge.
5651.5.1 by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646)
937
                try:
938
                    tags_to_fetch = set(self.tags.get_reverse_tag_dict())
939
                except errors.TagsNotSupported:
940
                    tags_to_fetch = set()
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
941
                fetch_spec = vf_search.NotInOtherForRevs(self.repository,
5651.5.1 by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646)
942
                    old_repository, required_ids=[self.last_revision()],
943
                    if_present_ids=tags_to_fetch, find_ghosts=True).execute()
944
                self.repository.fetch(old_repository, fetch_spec=fetch_spec)
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
945
            finally:
946
                old_repository.unlock()
4509.3.9 by Martin Pool
Split out Branch._unstack
947
        finally:
948
            pb.finished()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
949
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
950
    def _set_tags_bytes(self, bytes):
951
        """Mirror method for _get_tags_bytes.
952
953
        :seealso: Branch._get_tags_bytes.
954
        """
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
955
        op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked)
956
        op.add_cleanup(self.lock_write().unlock)
957
        return op.run_simple(bytes)
5535.2.3 by Andrew Bennetts
Reset cached tags when mutating tags.
958
959
    def _set_tags_bytes_locked(self, bytes):
960
        self._tags_bytes = bytes
961
        return self._transport.put_bytes('tags', bytes)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
962
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
963
    def _cache_revision_history(self, rev_history):
964
        """Set the cached revision history to rev_history.
965
966
        The revision_history method will use this cache to avoid regenerating
967
        the revision history.
968
969
        This API is semi-public; it only for use by subclasses, all other code
970
        should consider it to be private.
971
        """
972
        self._revision_history_cache = rev_history
973
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
974
    def _cache_revision_id_to_revno(self, revision_id_to_revno):
975
        """Set the cached revision_id => revno map to revision_id_to_revno.
976
977
        This API is semi-public; it only for use by subclasses, all other code
978
        should consider it to be private.
979
        """
980
        self._revision_id_to_revno_cache = revision_id_to_revno
981
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
982
    def _clear_cached_state(self):
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
983
        """Clear any cached data on this branch, e.g. cached revision history.
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
984
985
        This means the next call to revision_history will need to call
986
        _gen_revision_history.
987
988
        This API is semi-public; it only for use by subclasses, all other code
989
        should consider it to be private.
990
        """
991
        self._revision_history_cache = None
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
992
        self._revision_id_to_revno_cache = None
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
993
        self._last_revision_info_cache = None
5609.25.3 by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock.
994
        self._master_branch_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
995
        self._merge_sorted_revisions_cache = None
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
996
        self._partial_revision_history_cache = []
997
        self._partial_revision_id_to_revno_cache = {}
5535.2.1 by Andrew Bennetts
Cache a branch's tags during a read-lock.
998
        self._tags_bytes = None
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
999
1000
    def _gen_revision_history(self):
1001
        """Return sequence of revision hashes on to this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1002
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1003
        Unlike revision_history, this method always regenerates or rereads the
1004
        revision history, i.e. it does not cache the result, so repeated calls
1005
        may be expensive.
1006
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
1007
        Concrete subclasses should override this instead of revision_history so
1008
        that subclasses do not need to deal with caching logic.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1009
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1010
        This API is semi-public; it only for use by subclasses, all other code
1011
        should consider it to be private.
1012
        """
1013
        raise NotImplementedError(self._gen_revision_history)
1014
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
1015
    @deprecated_method(deprecated_in((2, 5, 0)))
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1016
    @needs_read_lock
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1017
    def revision_history(self):
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1018
        """Return sequence of revision ids on this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1019
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1020
        This method will cache the revision history for as long as it is safe to
1021
        do so.
1022
        """
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
1023
        return self._revision_history()
1024
1025
    def _revision_history(self):
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1026
        if 'evil' in debug.debug_flags:
1027
            mutter_callsite(3, "revision_history scales with history.")
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1028
        if self._revision_history_cache is not None:
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
1029
            history = self._revision_history_cache
1030
        else:
1031
            history = self._gen_revision_history()
1032
            self._cache_revision_history(history)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1033
        return list(history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1034
1035
    def revno(self):
1036
        """Return current revision number for this branch.
1037
1038
        That is equivalent to the number of revisions committed to
1039
        this branch.
1040
        """
3066.1.1 by John Arbash Meinel
Make the default Branch.revno() implementation just be a thunk to last_revision_info.
1041
        return self.last_revision_info()[0]
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1042
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1043
    def unbind(self):
1044
        """Older format branches cannot bind or unbind."""
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
1045
        raise errors.UpgradeRequired(self.user_url)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1046
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1047
    def last_revision(self):
3211.2.1 by Robert Collins
* Creating a new branch no longer tries to read the entire revision-history
1048
        """Return last revision id, or NULL_REVISION."""
1049
        return self.last_revision_info()[1]
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1050
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1051
    @needs_read_lock
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
1052
    def last_revision_info(self):
1053
        """Return information about the last revision.
1054
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1055
        :return: A tuple (revno, revision_id).
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
1056
        """
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1057
        if self._last_revision_info_cache is None:
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
1058
            self._last_revision_info_cache = self._read_last_revision_info()
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1059
        return self._last_revision_info_cache
1060
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
1061
    def _read_last_revision_info(self):
5718.8.3 by Jelmer Vernooij
More branch restructuring.
1062
        raise NotImplementedError(self._read_last_revision_info)
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
1063
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
1064
    @deprecated_method(deprecated_in((2, 4, 0)))
4048.2.2 by Jelmer Vernooij
New Branch.import_last_Revision_info() function used to pull revisions into the master branch during commit.
1065
    def import_last_revision_info(self, source_repo, revno, revid):
1066
        """Set the last revision info, importing from another repo if necessary.
1067
1068
        :param source_repo: Source repository to optionally fetch from
1069
        :param revno: Revision number of the new tip
1070
        :param revid: Revision id of the new tip
1071
        """
1072
        if not self.repository.has_same_location(source_repo):
1073
            self.repository.fetch(source_repo, revision_id=revid)
1074
        self.set_last_revision_info(revno, revid)
1075
5777.7.1 by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags.
1076
    def import_last_revision_info_and_tags(self, source, revno, revid,
1077
                                           lossy=False):
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1078
        """Set the last revision info, importing from another repo if necessary.
1079
1080
        This is used by the bound branch code to upload a revision to
1081
        the master branch first before updating the tip of the local branch.
1082
        Revisions referenced by source's tags are also transferred.
1083
5535.3.35 by Andrew Bennetts
Fix deprecation warning from some tests, correct some docstrings.
1084
        :param source: Source branch to optionally fetch from
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1085
        :param revno: Revision number of the new tip
1086
        :param revid: Revision id of the new tip
5777.7.1 by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags.
1087
        :param lossy: Whether to discard metadata that can not be
1088
            natively represented
1089
        :return: Tuple with the new revision number and revision id
1090
            (should only be different from the arguments when lossy=True)
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1091
        """
1092
        if not self.repository.has_same_location(source.repository):
5741.1.8 by Jelmer Vernooij
Remove fetch_tags argument.
1093
            self.fetch(source, revid)
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1094
        self.set_last_revision_info(revno, revid)
5777.7.1 by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags.
1095
        return (revno, revid)
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1096
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1097
    def revision_id_to_revno(self, revision_id):
1098
        """Given a revision id, return its revno"""
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1099
        if _mod_revision.is_null(revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1100
            return 0
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
1101
        history = self._revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1102
        try:
1103
            return history.index(revision_id) + 1
1104
        except ValueError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1105
            raise errors.NoSuchRevision(self, revision_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1106
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
1107
    @needs_read_lock
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1108
    def get_rev_id(self, revno, history=None):
1109
        """Find the revision id of the specified revno."""
1110
        if revno == 0:
2598.5.10 by Aaron Bentley
Return NULL_REVISION instead of None for the null revision
1111
            return _mod_revision.NULL_REVISION
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
1112
        last_revno, last_revid = self.last_revision_info()
1113
        if revno == last_revno:
1114
            return last_revid
1115
        if revno <= 0 or revno > last_revno:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1116
            raise errors.NoSuchRevision(self, revno)
4419.2.1 by Andrew Bennetts
Move _extend_partial_history into Branch base class, and use it in get_rev_id rather than self.revision_history().
1117
        distance_from_last = last_revno - revno
1118
        if len(self._partial_revision_history_cache) <= distance_from_last:
4419.2.17 by Andrew Bennetts
Fix test failures in test_lookup_revision_id_by_dotted.
1119
            self._extend_partial_history(distance_from_last)
1120
        return self._partial_revision_history_cache[distance_from_last]
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1121
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1122
    def pull(self, source, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
1123
             possible_transports=None, *args, **kwargs):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1124
        """Mirror source into this branch.
1125
1126
        This branch is considered to be 'local', having low latency.
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1127
1128
        :returns: PullResult instance
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1129
        """
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
1130
        return InterBranch.get(source, self).pull(overwrite=overwrite,
1131
            stop_revision=stop_revision,
1132
            possible_transports=possible_transports, *args, **kwargs)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1133
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
1134
    def push(self, target, overwrite=False, stop_revision=None, lossy=False,
1135
            *args, **kwargs):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1136
        """Mirror this branch into target.
1137
1138
        This branch is considered to be 'local', having low latency.
1139
        """
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
1140
        return InterBranch.get(self, target).push(overwrite, stop_revision,
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
1141
            lossy, *args, **kwargs)
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
1142
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1143
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1144
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1145
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1146
1147
    def get_parent(self):
1148
        """Return the parent location of the branch.
1149
4031.1.1 by Alexander Belchenko
Parent location is not used as default for push.
1150
        This is the default location for pull/missing.  The usual
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1151
        pattern is that the user can override it by specifying a
1152
        location.
1153
        """
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1154
        parent = self._get_parent_location()
1155
        if parent is None:
1156
            return parent
1157
        # This is an old-format absolute path to a local branch
1158
        # turn it into a url
1159
        if parent.startswith('/'):
1160
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1161
        try:
1162
            return urlutils.join(self.base[:-1], parent)
1163
        except errors.InvalidURLJoin, e:
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
1164
            raise errors.InaccessibleParent(parent, self.user_url)
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1165
1166
    def _get_parent_location(self):
1167
        raise NotImplementedError(self._get_parent_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1168
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1169
    def _set_config_location(self, name, url, config=None,
1170
                             make_relative=False):
1171
        if config is None:
1172
            config = self.get_config()
1173
        if url is None:
1174
            url = ''
1175
        elif make_relative:
1176
            url = urlutils.relative_url(self.base, url)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1177
        config.set_user_option(name, url, warn_masked=True)
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1178
1179
    def _get_config_location(self, name, config=None):
1180
        if config is None:
1181
            config = self.get_config()
1182
        location = config.get_user_option(name)
1183
        if location == '':
1184
            location = None
1185
        return location
1186
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
1187
    def get_child_submit_format(self):
1188
        """Return the preferred format of submissions to this branch."""
1189
        return self.get_config().get_user_option("child_submit_format")
1190
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
1191
    def get_submit_branch(self):
1192
        """Return the submit location of the branch.
1193
1194
        This is the default location for bundle.  The usual
1195
        pattern is that the user can override it by specifying a
1196
        location.
1197
        """
1198
        return self.get_config().get_user_option('submit_branch')
1199
1200
    def set_submit_branch(self, location):
1201
        """Return the submit location of the branch.
1202
1203
        This is the default location for bundle.  The usual
1204
        pattern is that the user can override it by specifying a
1205
        location.
1206
        """
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
1207
        self.get_config().set_user_option('submit_branch', location,
1208
            warn_masked=True)
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
1209
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1210
    def get_public_branch(self):
1211
        """Return the public location of the branch.
1212
4031.3.1 by Frank Aspell
Fixing various typos
1213
        This is used by merge directives.
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1214
        """
1215
        return self._get_config_location('public_branch')
1216
1217
    def set_public_branch(self, location):
1218
        """Return the submit location of the branch.
1219
1220
        This is the default location for bundle.  The usual
1221
        pattern is that the user can override it by specifying a
1222
        location.
1223
        """
1224
        self._set_config_location('public_branch', location)
1225
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1226
    def get_push_location(self):
1227
        """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).
1228
        push_loc = self.get_config().get_user_option('push_location')
1229
        return push_loc
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1230
1231
    def set_push_location(self, location):
1232
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
1233
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1234
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1235
    def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1236
        """Run the post_change_branch_tip hooks."""
1237
        hooks = Branch.hooks['post_change_branch_tip']
1238
        if not hooks:
1239
            return
1240
        new_revno, new_revid = self.last_revision_info()
1241
        params = ChangeBranchTipParams(
1242
            self, old_revno, new_revno, old_revid, new_revid)
1243
        for hook in hooks:
1244
            hook(params)
1245
1246
    def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1247
        """Run the pre_change_branch_tip hooks."""
1248
        hooks = Branch.hooks['pre_change_branch_tip']
1249
        if not hooks:
1250
            return
1251
        old_revno, old_revid = self.last_revision_info()
1252
        params = ChangeBranchTipParams(
1253
            self, old_revno, new_revno, old_revid, new_revid)
1254
        for hook in hooks:
4943.1.1 by Robert Collins
Do not fiddle with exceptions in the pre_change_branch_tip hook running code.
1255
            hook(params)
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
1256
1587.1.10 by Robert Collins
update updates working tree and branch together.
1257
    @needs_write_lock
1258
    def update(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1259
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
1260
1261
        :return: None or the last_revision pivoted out during the update.
1262
        """
1263
        return None
1264
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1265
    def check_revno(self, revno):
1266
        """\
1267
        Check whether a revno corresponds to any revision.
1268
        Zero (the NULL revision) is considered valid.
1269
        """
1270
        if revno != 0:
1271
            self.check_real_revno(revno)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1272
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1273
    def check_real_revno(self, revno):
1274
        """\
1275
        Check whether a revno corresponds to a real revision.
1276
        Zero (the NULL revision) is considered invalid
1277
        """
1278
        if revno < 1 or revno > self.revno():
3236.1.2 by Michael Hudson
clean up branch.py imports
1279
            raise errors.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.
1280
1281
    @needs_read_lock
4050.1.1 by Robert Collins
Fix race condition with branch hooks during cloning when the new branch is stacked.
1282
    def clone(self, to_bzrdir, revision_id=None, repository_policy=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.
1283
        """Clone this branch into to_bzrdir preserving all semantic values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1284
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1285
        Most API users will want 'create_clone_on_transport', which creates a
1286
        new bzrdir and branch on the fly.
1287
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.
1288
        revision_id: if not None, the revision history in the new branch will
1289
                     be truncated to end with revision_id.
1290
        """
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
1291
        result = to_bzrdir.create_branch()
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
1292
        result.lock_write()
1293
        try:
1294
            if repository_policy is not None:
1295
                repository_policy.configure_branch(result)
1296
            self.copy_content_into(result, revision_id=revision_id)
1297
        finally:
1298
            result.unlock()
1299
        return result
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.
1300
1301
    @needs_read_lock
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
1302
    def sprout(self, to_bzrdir, revision_id=None, repository_policy=None,
1303
            repository=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.
1304
        """Create a new line of development from the branch, into to_bzrdir.
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
1305
1306
        to_bzrdir controls the branch format.
1307
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.
1308
        revision_id: if not None, the revision history in the new branch will
1309
                     be truncated to end with revision_id.
1310
        """
4617.3.1 by Robert Collins
Fix test_stacking tests for 2a as a default format. The change to 2a exposed some actual bugs, both in tests and bzrdir/branch code.
1311
        if (repository_policy is not None and
1312
            repository_policy.requires_stacking()):
1313
            to_bzrdir._format.require_stacking(_skip_repo=True)
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
1314
        result = to_bzrdir.create_branch(repository=repository)
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
1315
        result.lock_write()
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
1316
        try:
1317
            if repository_policy is not None:
1318
                repository_policy.configure_branch(result)
1319
            self.copy_content_into(result, revision_id=revision_id)
6015.7.1 by John Arbash Meinel
No need to open the master branch just to get its URL.
1320
            master_url = self.get_bound_location()
1321
            if master_url is None:
5816.6.13 by A. S. Budden
Set the parent location to the branch to which we were bound if this is a bound branch.
1322
                result.set_parent(self.bzrdir.root_transport.base)
1323
            else:
6015.7.1 by John Arbash Meinel
No need to open the master branch just to get its URL.
1324
                result.set_parent(master_url)
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
1325
        finally:
1326
            result.unlock()
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.
1327
        return result
1328
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
1329
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1330
        """Synchronize last revision and revision history between branches.
1331
1332
        This version is most efficient when the destination is also a
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1333
        BzrBranch6, but works for BzrBranch5, as long as the destination's
1334
        repository contains all the lefthand ancestors of the intended
1335
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1336
1337
        :param destination: The branch to copy the history into
1338
        :param revision_id: The revision-id to truncate history at.  May
1339
          be None to copy complete history.
1340
        """
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1341
        source_revno, source_revision_id = self.last_revision_info()
1342
        if revision_id is None:
1343
            revno, revision_id = source_revno, source_revision_id
3650.3.3 by Aaron Bentley
fix sprout
1344
        else:
4266.3.8 by Jelmer Vernooij
Consistently use find_distance_to_null.
1345
            graph = self.repository.get_graph()
4266.3.1 by Jelmer Vernooij
Support cloning of branches with ghosts in the left hand side history.
1346
            try:
4266.3.8 by Jelmer Vernooij
Consistently use find_distance_to_null.
1347
                revno = graph.find_distance_to_null(revision_id, 
1348
                    [(source_revision_id, source_revno)])
1349
            except errors.GhostRevisionsHaveNoRevno:
1350
                # Default to 1, if we can't find anything else
1351
                revno = 1
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1352
        destination.set_last_revision_info(revno, revision_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1353
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.
1354
    def copy_content_into(self, destination, revision_id=None):
1355
        """Copy the content of self into destination.
1356
1357
        revision_id: if not None, the revision history in the new branch will
1358
                     be truncated to end with revision_id.
1359
        """
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
1360
        return InterBranch.get(self, destination).copy_content_into(
1361
            revision_id=revision_id)
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1362
1363
    def update_references(self, target):
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1364
        if not getattr(self._format, 'supports_reference_locations', False):
1365
            return
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1366
        reference_dict = self._get_all_reference_info()
4273.1.9 by Aaron Bentley
Cleanup
1367
        if len(reference_dict) == 0:
1368
            return
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1369
        old_base = self.base
1370
        new_base = target.base
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1371
        target_reference_dict = target._get_all_reference_info()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1372
        for file_id, (tree_path, branch_location) in (
1373
            reference_dict.items()):
1374
            branch_location = urlutils.rebase_url(branch_location,
1375
                                                  old_base, new_base)
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1376
            target_reference_dict.setdefault(
1377
                file_id, (tree_path, branch_location))
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1378
        target._set_all_reference_info(target_reference_dict)
1185.66.1 by Aaron Bentley
Merged from mainline
1379
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1380
    @needs_read_lock
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1381
    def check(self, refs):
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1382
        """Check consistency of the branch.
1383
1384
        In particular this checks that revisions given in the revision-history
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1385
        do actually match up in the revision graph, and that they're all
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1386
        present in the repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1387
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1388
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1389
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1390
        :param refs: Calculated refs for this branch as specified by
1391
            branch._get_check_refs()
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1392
        :return: A BranchCheckResult.
1393
        """
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
1394
        result = BranchCheckResult(self)
3389.2.1 by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent.
1395
        last_revno, last_revision_id = self.last_revision_info()
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1396
        actual_revno = refs[('lefthand-distance', last_revision_id)]
1397
        if actual_revno != last_revno:
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
1398
            result.errors.append(errors.BzrCheckError(
1399
                'revno does not match len(mainline) %s != %s' % (
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1400
                last_revno, actual_revno)))
1401
        # TODO: We should probably also check that self.revision_history
1402
        # matches the repository for older branch formats.
1403
        # If looking for the code that cross-checks repository parents against
6165.4.19 by Jelmer Vernooij
Avoid all iter_reverse_revision_history calls.
1404
        # the Graph.iter_lefthand_ancestry output, that is now a repository
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1405
        # specific check.
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
1406
        return result
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1407
6127.1.9 by Jelmer Vernooij
Add lightweight option to _get_checkout_format().
1408
    def _get_checkout_format(self, lightweight=False):
1910.2.39 by Aaron Bentley
Fix checkout bug
1409
        """Return the most suitable metadir for a checkout of this branch.
2018.5.87 by Andrew Bennetts
Make make_branch_and_tree fall back to creating a local checkout if the transport doesn't support working trees, allowing several more Remote tests to pass.
1410
        Weaves are used if this branch's repository uses weaves.
1910.2.39 by Aaron Bentley
Fix checkout bug
1411
        """
5582.10.3 by Jelmer Vernooij
Remove custom code for presplitout.
1412
        format = self.repository.bzrdir.checkout_metadir()
1413
        format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
1414
        return format
1415
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1416
    def create_clone_on_transport(self, to_transport, revision_id=None,
5448.6.1 by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text.
1417
        stacked_on=None, create_prefix=False, use_existing_dir=False,
1418
        no_tree=None):
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1419
        """Create a clone of this branch and its bzrdir.
1420
1421
        :param to_transport: The transport to clone onto.
1422
        :param revision_id: The revision id to use as tip in the new branch.
1423
            If None the tip is obtained from this branch.
1424
        :param stacked_on: An optional URL to stack the clone on.
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
1425
        :param create_prefix: Create any missing directories leading up to
1426
            to_transport.
1427
        :param use_existing_dir: Use an existing directory if one exists.
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1428
        """
4044.1.2 by Robert Collins
Reinstate the TODO comment about bzrdir.clone_on_transport.
1429
        # XXX: Fix the bzrdir API to allow getting the branch back from the
1430
        # clone call. Or something. 20090224 RBC/spiv.
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
1431
        # XXX: Should this perhaps clone colocated branches as well, 
1432
        # rather than just the default branch? 20100319 JRV
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
1433
        if revision_id is None:
1434
            revision_id = self.last_revision()
4634.105.1 by Andrew Bennetts
Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory.
1435
        dir_to = self.bzrdir.clone_on_transport(to_transport,
1436
            revision_id=revision_id, stacked_on=stacked_on,
5448.6.1 by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text.
1437
            create_prefix=create_prefix, use_existing_dir=use_existing_dir,
5448.6.2 by Matthew Gordon
Tested push --no-tree ang gor it working right.
1438
            no_tree=no_tree)
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1439
        return dir_to.open_branch()
1440
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1441
    def create_checkout(self, to_location, revision_id=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1442
                        lightweight=False, accelerator_tree=None,
1443
                        hardlink=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1444
        """Create a checkout of a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1445
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1446
        :param to_location: The url to produce the checkout at
1447
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
1448
        :param lightweight: If True, produce a lightweight checkout, otherwise,
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1449
            produce a bound branch (heavyweight checkout)
3123.5.17 by Aaron Bentley
Update docs
1450
        :param accelerator_tree: A tree which can be used for retrieving file
1451
            contents more quickly than the revision tree, i.e. a workingtree.
1452
            The revision tree will be used for cases where accelerator_tree's
1453
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1454
        :param hardlink: If true, hard-link files from accelerator_tree,
1455
            where possible.
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1456
        :return: The tree of the created checkout
1457
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
1458
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1459
        t.ensure_base()
6127.1.9 by Jelmer Vernooij
Add lightweight option to _get_checkout_format().
1460
        format = self._get_checkout_format(lightweight=lightweight)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1461
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
1462
            checkout = format.initialize_on_transport(t)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1463
            from_branch = BranchReferenceFormat().initialize(checkout, 
1464
                target_branch=self)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1465
        else:
6207.3.3 by jelmer at samba
Fix tests and the like.
1466
            checkout_branch = controldir.ControlDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
1467
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1468
            checkout = checkout_branch.bzrdir
1469
            checkout_branch.bind(self)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1470
            # pull up to the specified revision_id to set the initial
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1471
            # branch tip correctly, and seed it with history.
1472
            checkout_branch.pull(self, stop_revision=revision_id)
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1473
            from_branch=None
1474
        tree = checkout.create_workingtree(revision_id,
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1475
                                           from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1476
                                           accelerator_tree=accelerator_tree,
1477
                                           hardlink=hardlink)
2255.2.226 by Robert Collins
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
1478
        basis_tree = tree.basis_tree()
1479
        basis_tree.lock_read()
1480
        try:
1481
            for path, file_id in basis_tree.iter_references():
1482
                reference_parent = self.reference_parent(file_id, path)
1483
                reference_parent.create_checkout(tree.abspath(path),
1484
                    basis_tree.get_reference_revision(file_id, path),
1485
                    lightweight)
1486
        finally:
1487
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1488
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1489
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
1490
    @needs_write_lock
1491
    def reconcile(self, thorough=True):
1492
        """Make sure the data stored in this branch is consistent."""
1493
        from bzrlib.reconcile import BranchReconciler
1494
        reconciler = BranchReconciler(self, thorough=thorough)
1495
        reconciler.reconcile()
1496
        return reconciler
1497
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
1498
    def reference_parent(self, file_id, path, possible_transports=None):
2100.3.29 by Aaron Bentley
Get merge working initially
1499
        """Return the parent branch for a tree-reference file_id
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1500
2100.3.29 by Aaron Bentley
Get merge working initially
1501
        :param file_id: The file_id of the tree reference
1502
        :param path: The path of the file_id in the tree
1503
        :return: A branch associated with the file_id
1504
        """
1505
        # FIXME should provide multiple branches, based on config
5158.6.11 by Martin Pool
Revert some fragile dependencies of branch on .base
1506
        return Branch.open(self.bzrdir.root_transport.clone(path).base,
5158.6.8 by Martin Pool
Go back to opening branch using url, so it can use all possible transports
1507
                           possible_transports=possible_transports)
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
1508
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
1509
    def supports_tags(self):
1510
        return self._format.supports_tags()
1511
5086.4.7 by Jelmer Vernooij
Put automatic_tag_name on Branch.
1512
    def automatic_tag_name(self, revision_id):
1513
        """Try to automatically find the tag name for a revision.
1514
1515
        :param revision_id: Revision id of the revision.
5086.4.8 by Jelmer Vernooij
Review comments from Ian.
1516
        :return: A tag name or None if no tag name could be determined.
5086.4.7 by Jelmer Vernooij
Put automatic_tag_name on Branch.
1517
        """
1518
        for hook in Branch.hooks['automatic_tag_name']:
1519
            ret = hook(self, revision_id)
1520
            if ret is not None:
1521
                return ret
1522
        return None
1523
3441.5.27 by Andrew Bennetts
Tweaks suggested by John's review: rename _check_if_descendant_or_diverged, move caching last_revision_info into base Branch, better use of lock decorators.
1524
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1525
                                         other_branch):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1526
        """Ensure that revision_b is a descendant of revision_a.
1527
1528
        This is a helper function for update_revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1529
3441.5.18 by Andrew Bennetts
Fix some test failures.
1530
        :raises: DivergedBranches if revision_b has diverged from revision_a.
1531
        :returns: True if revision_b is a descendant of revision_a.
1532
        """
1533
        relation = self._revision_relations(revision_a, revision_b, graph)
1534
        if relation == 'b_descends_from_a':
1535
            return True
1536
        elif relation == 'diverged':
1537
            raise errors.DivergedBranches(self, other_branch)
1538
        elif relation == 'a_descends_from_b':
1539
            return False
1540
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1541
            raise AssertionError("invalid relation: %r" % (relation,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1542
1543
    def _revision_relations(self, revision_a, revision_b, graph):
1544
        """Determine the relationship between two revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1545
3441.5.18 by Andrew Bennetts
Fix some test failures.
1546
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1547
        """
1548
        heads = graph.heads([revision_a, revision_b])
1549
        if heads == set([revision_b]):
1550
            return 'b_descends_from_a'
1551
        elif heads == set([revision_a, revision_b]):
1552
            # These branches have diverged
1553
            return 'diverged'
1554
        elif heads == set([revision_a]):
1555
            return 'a_descends_from_b'
1556
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1557
            raise AssertionError("invalid heads: %r" % (heads,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1558
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
1559
    def heads_to_fetch(self):
5672.1.1 by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it.
1560
        """Return the heads that must and that should be fetched to copy this
1561
        branch into another repo.
1562
1563
        :returns: a 2-tuple of (must_fetch, if_present_fetch).  must_fetch is a
1564
            set of heads that must be fetched.  if_present_fetch is a set of
1565
            heads that must be fetched if present, but no error is necessary if
1566
            they are not present.
1567
        """
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
1568
        # For bzr native formats must_fetch is just the tip, and if_present_fetch
1569
        # are the tags.
1570
        must_fetch = set([self.last_revision()])
6015.15.1 by John Arbash Meinel
Start working on a config entry for testing whether we should fetch tags or not.
1571
        if_present_fetch = set()
1572
        c = self.get_config()
1573
        include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1574
                                                 default=False)
1575
        if include_tags:
1576
            try:
1577
                if_present_fetch = set(self.tags.get_reverse_tag_dict())
1578
            except errors.TagsNotSupported:
1579
                pass
5672.1.1 by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it.
1580
        must_fetch.discard(_mod_revision.NULL_REVISION)
1581
        if_present_fetch.discard(_mod_revision.NULL_REVISION)
1582
        return must_fetch, if_present_fetch
1583
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1584
5669.3.10 by Jelmer Vernooij
Use ControlComponentFormat.
1585
class BranchFormat(controldir.ControlComponentFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1586
    """An encapsulation of the initialization and open routines for a format.
1587
1588
    Formats provide three things:
1589
     * An initialization routine,
1590
     * a format string,
1591
     * an open routine.
1592
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1593
    Formats are placed in an dict by their format string for reference
5448.2.1 by Martin
Fix some "its" vs. "it's" spelling confusion in bzrlib code... also, ahem, a name in the NEWS file
1594
    during branch opening. It's not required that these be instances, they
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1595
    can be classes themselves with class methods - it simply depends on
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1596
    whether state is needed for a given format or not.
1597
1598
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1599
    methods on the format class. Do not deprecate the object, as the
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1600
    object will be created every time regardless.
1601
    """
1602
2363.5.5 by Aaron Bentley
add info.describe_format
1603
    def __eq__(self, other):
1604
        return self.__class__ is other.__class__
1605
1606
    def __ne__(self, other):
1607
        return not (self == other)
1608
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1609
    @classmethod
6207.3.3 by jelmer at samba
Fix tests and the like.
1610
    def find_format(klass, controldir, name=None):
1611
        """Return the format for the branch object in controldir."""
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1612
        try:
6207.3.3 by jelmer at samba
Fix tests and the like.
1613
            transport = controldir.get_branch_transport(None, name=name)
6266.1.1 by Jelmer Vernooij
Support branching into colocated branch.
1614
        except errors.NoSuchFile:
1615
            raise errors.NotBranchError(path=name, bzrdir=controldir)
1616
        try:
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1617
            format_string = transport.get_bytes("format")
5662.2.6 by Jelmer Vernooij
add more tests.
1618
            return format_registry.get(format_string)
3236.1.2 by Michael Hudson
clean up branch.py imports
1619
        except errors.NoSuchFile:
6207.3.3 by jelmer at samba
Fix tests and the like.
1620
            raise errors.NotBranchError(path=transport.base, bzrdir=controldir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1621
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
1622
            raise errors.UnknownFormatError(format=format_string, kind='branch')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1623
1624
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1625
    @deprecated_method(deprecated_in((2, 4, 0)))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1626
    def get_default_format(klass):
1627
        """Return the current default format."""
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1628
        return format_registry.get_default()
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1629
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1630
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1631
    @deprecated_method(deprecated_in((2, 4, 0)))
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1632
    def get_formats(klass):
1633
        """Get all the known formats.
1634
1635
        Warning: This triggers a load of all lazy registered formats: do not
1636
        use except when that is desireed.
1637
        """
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1638
        return format_registry._get_all()
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1639
6207.3.3 by jelmer at samba
Fix tests and the like.
1640
    def get_reference(self, controldir, name=None):
1641
        """Get the target reference of the branch in controldir.
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1642
1643
        format probing must have been completed before calling
1644
        this method - it is assumed that the format of the branch
6207.3.3 by jelmer at samba
Fix tests and the like.
1645
        in controldir is correct.
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1646
6207.3.3 by jelmer at samba
Fix tests and the like.
1647
        :param controldir: The controldir to get the branch data from.
5147.4.6 by Jelmer Vernooij
consistency in names
1648
        :param name: Name of the colocated branch to fetch
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1649
        :return: None if the branch is not a reference branch.
1650
        """
1651
        return None
1652
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1653
    @classmethod
6207.3.3 by jelmer at samba
Fix tests and the like.
1654
    def set_reference(self, controldir, name, to_branch):
1655
        """Set the target reference of the branch in controldir.
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1656
1657
        format probing must have been completed before calling
1658
        this method - it is assumed that the format of the branch
6207.3.3 by jelmer at samba
Fix tests and the like.
1659
        in controldir is correct.
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1660
6207.3.3 by jelmer at samba
Fix tests and the like.
1661
        :param controldir: The controldir to set the branch reference for.
5147.4.6 by Jelmer Vernooij
consistency in names
1662
        :param name: Name of colocated branch to set, None for default
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1663
        :param to_branch: branch that the checkout is to reference
1664
        """
1665
        raise NotImplementedError(self.set_reference)
1666
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1667
    def get_format_string(self):
1668
        """Return the ASCII format string that identifies this format."""
1669
        raise NotImplementedError(self.get_format_string)
1670
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1671
    def get_format_description(self):
1672
        """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).
1673
        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
1674
6207.3.3 by jelmer at samba
Fix tests and the like.
1675
    def _run_post_branch_init_hooks(self, controldir, name, branch):
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1676
        hooks = Branch.hooks['post_branch_init']
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1677
        if not hooks:
1678
            return
6207.3.3 by jelmer at samba
Fix tests and the like.
1679
        params = BranchInitHookParams(self, controldir, name, branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1680
        for hook in hooks:
1681
            hook(params)
1682
6207.3.3 by jelmer at samba
Fix tests and the like.
1683
    def initialize(self, controldir, name=None, repository=None,
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
1684
                   append_revisions_only=None):
6207.3.3 by jelmer at samba
Fix tests and the like.
1685
        """Create a branch of this format in controldir.
1686
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1687
        :param name: Name of the colocated branch to create.
1688
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1689
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1690
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.
1691
    def is_supported(self):
1692
        """Is this format supported?
1693
1694
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1695
        Unsupported formats may not support initialization or committing or
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.
1696
        some other features depending on the reason for not being supported.
1697
        """
1698
        return True
1699
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
1700
    def make_tags(self, branch):
1701
        """Create a tags object for branch.
1702
1703
        This method is on BranchFormat, because BranchFormats are reflected
1704
        over the wire via network_name(), whereas full Branch instances require
1705
        multiple VFS method calls to operate at all.
1706
1707
        The default implementation returns a disabled-tags instance.
1708
1709
        Note that it is normal for branch to be a RemoteBranch when using tags
1710
        on a RemoteBranch.
1711
        """
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
1712
        return _mod_tag.DisabledTags(branch)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
1713
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1714
    def network_name(self):
1715
        """A simple byte string uniquely identifying this format for RPC calls.
1716
1717
        MetaDir branch formats use their disk format string to identify the
1718
        repository over the wire. All in one formats such as bzr < 0.8, and
1719
        foreign formats like svn/git and hg should use some marker which is
1720
        unique and immutable.
1721
        """
1722
        raise NotImplementedError(self.network_name)
1723
6207.3.3 by jelmer at samba
Fix tests and the like.
1724
    def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
1725
            found_repository=None, possible_transports=None):
6207.3.3 by jelmer at samba
Fix tests and the like.
1726
        """Return the branch object for controldir.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1727
6207.3.3 by jelmer at samba
Fix tests and the like.
1728
        :param controldir: A ControlDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1729
        :param name: Name of colocated branch to open
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1730
        :param _found: a private parameter, do not use it. It is used to
1731
            indicate if format probing has already be done.
1732
        :param ignore_fallbacks: when set, no fallback branches will be opened
1733
            (if there are any).  Default is to open fallbacks.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1734
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1735
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1736
1737
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1738
    @deprecated_method(deprecated_in((2, 4, 0)))
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1739
    def register_format(klass, format):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1740
        """Register a metadir format.
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1741
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1742
        See MetaDirBranchFormatFactory for the ability to register a format
1743
        without loading the code the format needs until it is actually used.
1744
        """
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
1745
        format_registry.register(format)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1746
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.
1747
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1748
    @deprecated_method(deprecated_in((2, 4, 0)))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1749
    def set_default_format(klass, format):
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1750
        format_registry.set_default(format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1751
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
1752
    def supports_set_append_revisions_only(self):
1753
        """True if this format supports set_append_revisions_only."""
1754
        return False
1755
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1756
    def supports_stacking(self):
1757
        """True if this format records a stacked-on branch."""
1758
        return False
1759
5674.1.1 by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat.
1760
    def supports_leaving_lock(self):
1761
        """True if this format supports leaving locks in place."""
1762
        return False # by default
1763
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1764
    @classmethod
5662.2.6 by Jelmer Vernooij
add more tests.
1765
    @deprecated_method(deprecated_in((2, 4, 0)))
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.
1766
    def unregister_format(klass, format):
5662.2.3 by Jelmer Vernooij
Fix tests.
1767
        format_registry.remove(format)
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
1768
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1769
    def __str__(self):
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1770
        return self.get_format_description().rstrip()
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1771
2220.2.10 by Martin Pool
(broken) start moving things to branches
1772
    def supports_tags(self):
1773
        """True if this format supports tags stored in the branch"""
1774
        return False  # by default
1775
6123.4.6 by Jelmer Vernooij
Move flags to BranchFormat.
1776
    def tags_are_versioned(self):
1777
        """Whether the tag container for this branch versions tags."""
1778
        return False
1779
1780
    def supports_tags_referencing_ghosts(self):
1781
        """True if tags can reference ghost revisions."""
1782
        return True
1783
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1784
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1785
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
1786
    """A factory for a BranchFormat object, permitting simple lazy registration.
1787
    
1788
    While none of the built in BranchFormats are lazy registered yet,
1789
    bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1790
    use it, and the bzr-loom plugin uses it as well (see
1791
    bzrlib.plugins.loom.formats).
1792
    """
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1793
1794
    def __init__(self, format_string, module_name, member_name):
1795
        """Create a MetaDirBranchFormatFactory.
1796
1797
        :param format_string: The format string the format has.
1798
        :param module_name: Module to load the format class from.
1799
        :param member_name: Attribute name within the module for the format class.
1800
        """
1801
        registry._LazyObjectGetter.__init__(self, module_name, member_name)
1802
        self._format_string = format_string
1803
        
1804
    def get_format_string(self):
1805
        """See BranchFormat.get_format_string."""
1806
        return self._format_string
1807
1808
    def __call__(self):
1809
        """Used for network_format_registry support."""
1810
        return self.get_obj()()
1811
1812
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1813
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1814
    """A dictionary mapping hook name to a list of callables for branch hooks.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1815
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1816
    e.g. ['set_rh'] Is the list of items to be called when the
1817
    set_revision_history function is invoked.
1818
    """
1819
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1820
    def __init__(self):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1821
        """Create the default hooks.
1822
1823
        These are all empty initially, because by default nothing should get
1824
        notified.
1825
        """
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1826
        Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1827
        self.add_hook('set_rh',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1828
            "Invoked whenever the revision history has been set via "
1829
            "set_revision_history. The api signature is (branch, "
1830
            "revision_history), and the branch will be write-locked. "
1831
            "The set_rh hook can be expensive for bzr to trigger, a better "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1832
            "hook to use is Branch.post_change_branch_tip.", (0, 15))
1833
        self.add_hook('open',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1834
            "Called with the Branch object that has been opened after a "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1835
            "branch is opened.", (1, 8))
1836
        self.add_hook('post_push',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1837
            "Called after a push operation completes. post_push is called "
4053.3.4 by Jelmer Vernooij
Update branch hooks documentation.
1838
            "with a bzrlib.branch.BranchPushResult object and only runs in the "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1839
            "bzr client.", (0, 15))
1840
        self.add_hook('post_pull',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1841
            "Called after a pull operation completes. post_pull is called "
1842
            "with a bzrlib.branch.PullResult object and only runs in the "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1843
            "bzr client.", (0, 15))
1844
        self.add_hook('pre_commit',
5430.4.2 by Vincent Ladeuil
Fix typo in Branch.pre_commit HookPoint docstring.
1845
            "Called after a commit is calculated but before it is "
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1846
            "completed. pre_commit is called with (local, master, old_revno, "
1847
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1848
            "). old_revid is NULL_REVISION for the first commit to a branch, "
1849
            "tree_delta is a TreeDelta object describing changes from the "
1850
            "basis revision. hooks MUST NOT modify this delta. "
1851
            " future_tree is an in-memory tree obtained from "
1852
            "CommitBuilder.revision_tree() and hooks MUST NOT modify this "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1853
            "tree.", (0,91))
1854
        self.add_hook('post_commit',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1855
            "Called in the bzr client after a commit has completed. "
1856
            "post_commit is called with (local, master, old_revno, old_revid, "
1857
            "new_revno, new_revid). old_revid is NULL_REVISION for the first "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1858
            "commit to a branch.", (0, 15))
1859
        self.add_hook('post_uncommit',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1860
            "Called in the bzr client after an uncommit completes. "
1861
            "post_uncommit is called with (local, master, old_revno, "
1862
            "old_revid, new_revno, new_revid) where local is the local branch "
1863
            "or None, master is the target branch, and an empty branch "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1864
            "receives new_revno of 0, new_revid of None.", (0, 15))
1865
        self.add_hook('pre_change_branch_tip',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1866
            "Called in bzr client and server before a change to the tip of a "
1867
            "branch is made. pre_change_branch_tip is called with a "
1868
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1869
            "commit, uncommit will all trigger this hook.", (1, 6))
1870
        self.add_hook('post_change_branch_tip',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1871
            "Called in bzr client and server after a change to the tip of a "
1872
            "branch is made. post_change_branch_tip is called with a "
1873
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1874
            "commit, uncommit will all trigger this hook.", (1, 4))
1875
        self.add_hook('transform_fallback_location',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1876
            "Called when a stacked branch is activating its fallback "
1877
            "locations. transform_fallback_location is called with (branch, "
1878
            "url), and should return a new url. Returning the same url "
1879
            "allows it to be used as-is, returning a different one can be "
1880
            "used to cause the branch to stack on a closer copy of that "
1881
            "fallback_location. Note that the branch cannot have history "
1882
            "accessing methods called on it during this hook because the "
1883
            "fallback locations have not been activated. When there are "
1884
            "multiple hooks installed for transform_fallback_location, "
1885
            "all are called with the url returned from the previous hook."
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1886
            "The order is however undefined.", (1, 9))
1887
        self.add_hook('automatic_tag_name',
5050.20.1 by Alexander Belchenko
trivial doc change to provide better docs in html format (space between two sentences needed)
1888
            "Called to determine an automatic tag name for a revision. "
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1889
            "automatic_tag_name is called with (branch, revision_id) and "
1890
            "should return a tag name or None if no tag name could be "
5086.4.9 by Jelmer Vernooij
Update documentation.
1891
            "determined. The first non-None tag name returned will be used.",
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1892
            (2, 2))
1893
        self.add_hook('post_branch_init',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1894
            "Called after new branch initialization completes. "
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1895
            "post_branch_init is called with a "
1896
            "bzrlib.branch.BranchInitHookParams. "
1897
            "Note that init, branch and checkout (both heavyweight and "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1898
            "lightweight) will all trigger this hook.", (2, 2))
1899
        self.add_hook('post_switch',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1900
            "Called after a checkout switches branch. "
1901
            "post_switch is called with a "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1902
            "bzrlib.branch.SwitchHookParams.", (2, 2))
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1903
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1904
1905
1906
# install the default hooks into the Branch class.
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1907
Branch.hooks = BranchHooks()
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1908
1909
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1910
class ChangeBranchTipParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1911
    """Object holding parameters passed to `*_change_branch_tip` hooks.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1912
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1913
    There are 5 fields that hooks may wish to access:
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1914
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1915
    :ivar branch: the branch being changed
1916
    :ivar old_revno: revision number before the change
1917
    :ivar new_revno: revision number after the change
1918
    :ivar old_revid: revision id before the change
1919
    :ivar new_revid: revision id after the change
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1920
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1921
    The revid fields are strings. The revno fields are integers.
1922
    """
1923
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1924
    def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1925
        """Create a group of ChangeBranchTip parameters.
1926
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1927
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1928
        :param old_revno: Revision number before the change.
1929
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1930
        :param old_revid: Tip revision id before the change.
1931
        :param new_revid: Tip revision id after the change.
1932
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1933
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1934
        self.old_revno = old_revno
1935
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1936
        self.old_revid = old_revid
1937
        self.new_revid = new_revid
1938
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1939
    def __eq__(self, other):
1940
        return self.__dict__ == other.__dict__
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1941
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1942
    def __repr__(self):
1943
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1944
            self.__class__.__name__, self.branch,
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1945
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1946
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1947
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1948
class BranchInitHookParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1949
    """Object holding parameters passed to `*_branch_init` hooks.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1950
1951
    There are 4 fields that hooks may wish to access:
1952
1953
    :ivar format: the branch format
6207.3.3 by jelmer at samba
Fix tests and the like.
1954
    :ivar bzrdir: the ControlDir where the branch will be/has been initialized
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1955
    :ivar name: name of colocated branch, if any (or None)
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1956
    :ivar branch: the branch created
1957
1958
    Note that for lightweight checkouts, the bzrdir and format fields refer to
1959
    the checkout, hence they are different from the corresponding fields in
1960
    branch, which refer to the original branch.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1961
    """
1962
6207.3.3 by jelmer at samba
Fix tests and the like.
1963
    def __init__(self, format, controldir, name, branch):
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1964
        """Create a group of BranchInitHook parameters.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1965
1966
        :param format: the branch format
6207.3.3 by jelmer at samba
Fix tests and the like.
1967
        :param controldir: the ControlDir where the branch will be/has been
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1968
            initialized
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1969
        :param name: name of colocated branch, if any (or None)
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1970
        :param branch: the branch created
1971
1972
        Note that for lightweight checkouts, the bzrdir and format fields refer
1973
        to the checkout, hence they are different from the corresponding fields
1974
        in branch, which refer to the original branch.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1975
        """
1976
        self.format = format
6207.3.3 by jelmer at samba
Fix tests and the like.
1977
        self.bzrdir = controldir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1978
        self.name = name
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1979
        self.branch = branch
1980
1981
    def __eq__(self, other):
1982
        return self.__dict__ == other.__dict__
1983
1984
    def __repr__(self):
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
1985
        return "<%s of %s>" % (self.__class__.__name__, self.branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1986
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1987
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1988
class SwitchHookParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1989
    """Object holding parameters passed to `*_switch` hooks.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1990
1991
    There are 4 fields that hooks may wish to access:
1992
6207.3.3 by jelmer at samba
Fix tests and the like.
1993
    :ivar control_dir: ControlDir of the checkout to change
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1994
    :ivar to_branch: branch that the checkout is to reference
1995
    :ivar force: skip the check for local commits in a heavy checkout
1996
    :ivar revision_id: revision ID to switch to (or None)
1997
    """
1998
1999
    def __init__(self, control_dir, to_branch, force, revision_id):
2000
        """Create a group of SwitchHook parameters.
2001
6207.3.3 by jelmer at samba
Fix tests and the like.
2002
        :param control_dir: ControlDir of the checkout to change
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
2003
        :param to_branch: branch that the checkout is to reference
2004
        :param force: skip the check for local commits in a heavy checkout
2005
        :param revision_id: revision ID to switch to (or None)
2006
        """
2007
        self.control_dir = control_dir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2008
        self.to_branch = to_branch
2009
        self.force = force
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
2010
        self.revision_id = revision_id
2011
2012
    def __eq__(self, other):
2013
        return self.__dict__ == other.__dict__
2014
2015
    def __repr__(self):
2016
        return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
2017
            self.control_dir, self.to_branch,
2018
            self.revision_id)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
2019
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2020
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2021
class BranchFormatMetadir(BranchFormat):
2022
    """Common logic for meta-dir based branch formats."""
2023
2024
    def _branch_class(self):
2025
        """What class to instantiate on open calls."""
2026
        raise NotImplementedError(self._branch_class)
2027
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2028
    def _get_initial_config(self, append_revisions_only=None):
2029
        if append_revisions_only:
2030
            return "append_revisions_only = True\n"
2031
        else:
2032
            # Avoid writing anything if append_revisions_only is disabled,
2033
            # as that is the default.
2034
            return ""
2035
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2036
    def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
2037
                           repository=None):
2038
        """Initialize a branch in a bzrdir, with specified files
2039
2040
        :param a_bzrdir: The bzrdir to initialize the branch in
2041
        :param utf8_files: The files to create as a list of
2042
            (filename, content) tuples
2043
        :param name: Name of colocated branch to create, if any
2044
        :return: a branch in this format
2045
        """
2046
        mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2047
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2048
        control_files = lockable_files.LockableFiles(branch_transport,
2049
            'lock', lockdir.LockDir)
2050
        control_files.create_lock()
2051
        control_files.lock_write()
2052
        try:
2053
            utf8_files += [('format', self.get_format_string())]
2054
            for (filename, content) in utf8_files:
2055
                branch_transport.put_bytes(
2056
                    filename, content,
2057
                    mode=a_bzrdir._get_file_mode())
2058
        finally:
2059
            control_files.unlock()
2060
        branch = self.open(a_bzrdir, name, _found=True,
2061
                found_repository=repository)
2062
        self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2063
        return branch
2064
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2065
    def network_name(self):
2066
        """A simple byte string uniquely identifying this format for RPC calls.
2067
2068
        Metadir branch formats use their format string.
2069
        """
2070
        return self.get_format_string()
2071
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2072
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2073
            found_repository=None, possible_transports=None):
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2074
        """See BranchFormat.open()."""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2075
        if not _found:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2076
            format = BranchFormat.find_format(a_bzrdir, name=name)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2077
            if format.__class__ != self.__class__:
2078
                raise AssertionError("wrong format %r found for %r" %
2079
                    (format, self))
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2080
        transport = a_bzrdir.get_branch_transport(None, name=name)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2081
        try:
2082
            control_files = lockable_files.LockableFiles(transport, 'lock',
2083
                                                         lockdir.LockDir)
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2084
            if found_repository is None:
2085
                found_repository = a_bzrdir.find_repository()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2086
            return self._branch_class()(_format=self,
2087
                              _control_files=control_files,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2088
                              name=name,
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2089
                              a_bzrdir=a_bzrdir,
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2090
                              _repository=found_repository,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2091
                              ignore_fallbacks=ignore_fallbacks,
2092
                              possible_transports=possible_transports)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2093
        except errors.NoSuchFile:
4734.4.7 by Andrew Bennetts
Defer checking for a repository in NotBranchError case until we format the error as a string. (test_smart currently fails)
2094
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2095
6207.3.9 by Jelmer Vernooij
Fix _matchingbzrdir.
2096
    @property
2097
    def _matchingbzrdir(self):
2098
        ret = bzrdir.BzrDirMetaFormat1()
2099
        ret.set_branch_format(self)
2100
        return ret
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2101
2102
    def supports_tags(self):
2103
        return True
2104
5674.1.1 by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat.
2105
    def supports_leaving_lock(self):
2106
        return True
2107
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2108
2109
class BzrBranchFormat5(BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2110
    """Bzr branch format 5.
2111
2112
    This format has:
2113
     - a revision-history file.
2114
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2115
     - a lock dir guarding the branch itself
2116
     - 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.
2117
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2118
2119
    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.
2120
    """
2121
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2122
    def _branch_class(self):
2123
        return BzrBranch5
2124
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2125
    def get_format_string(self):
2126
        """See BranchFormat.get_format_string()."""
2127
        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
2128
2129
    def get_format_description(self):
2130
        """See BranchFormat.get_format_description()."""
2131
        return "Branch format 5"
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2132
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2133
    def initialize(self, a_bzrdir, name=None, repository=None,
2134
                   append_revisions_only=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2135
        """Create a branch of this format in a_bzrdir."""
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2136
        if append_revisions_only:
2137
            raise errors.UpgradeRequired(a_bzrdir.user_url)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2138
        utf8_files = [('revision-history', ''),
2139
                      ('branch-name', ''),
2140
                      ]
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2141
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2142
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2143
    def supports_tags(self):
2144
        return False
2145
2146
2147
class BzrBranchFormat6(BranchFormatMetadir):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2148
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2149
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
2150
    Unlike previous formats, this has no explicit revision history. Instead,
2151
    this just stores the last-revision, and the left-hand history leading
2152
    up to there is the history.
2153
2154
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2155
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
2156
    """
2157
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2158
    def _branch_class(self):
2159
        return BzrBranch6
2160
2230.3.1 by Aaron Bentley
Get branch6 creation working
2161
    def get_format_string(self):
2162
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
2163
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
2164
2165
    def get_format_description(self):
2166
        """See BranchFormat.get_format_description()."""
2167
        return "Branch format 6"
2168
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2169
    def initialize(self, a_bzrdir, name=None, repository=None,
2170
                   append_revisions_only=None):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2171
        """Create a branch of this format in a_bzrdir."""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2172
        utf8_files = [('last-revision', '0 null:\n'),
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2173
                      ('branch.conf',
2174
                          self._get_initial_config(append_revisions_only)),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
2175
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
2176
                      ]
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2177
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2178
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
2179
    def make_tags(self, branch):
2180
        """See bzrlib.branch.BranchFormat.make_tags()."""
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
2181
        return _mod_tag.BasicTags(branch)
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
2182
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
2183
    def supports_set_append_revisions_only(self):
2184
        return True
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
2185
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2186
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2187
class BzrBranchFormat8(BranchFormatMetadir):
2188
    """Metadir format supporting storing locations of subtree branches."""
2189
2190
    def _branch_class(self):
2191
        return BzrBranch8
2192
2193
    def get_format_string(self):
2194
        """See BranchFormat.get_format_string()."""
2195
        return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2196
2197
    def get_format_description(self):
2198
        """See BranchFormat.get_format_description()."""
2199
        return "Branch format 8"
2200
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2201
    def initialize(self, a_bzrdir, name=None, repository=None,
2202
                   append_revisions_only=None):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2203
        """Create a branch of this format in a_bzrdir."""
2204
        utf8_files = [('last-revision', '0 null:\n'),
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2205
                      ('branch.conf',
2206
                          self._get_initial_config(append_revisions_only)),
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2207
                      ('tags', ''),
2208
                      ('references', '')
2209
                      ]
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2210
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2211
2212
    def make_tags(self, branch):
2213
        """See bzrlib.branch.BranchFormat.make_tags()."""
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
2214
        return _mod_tag.BasicTags(branch)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2215
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
2216
    def supports_set_append_revisions_only(self):
2217
        return True
2218
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2219
    def supports_stacking(self):
2220
        return True
2221
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
2222
    supports_reference_locations = True
2223
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2224
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2225
class BzrBranchFormat7(BranchFormatMetadir):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2226
    """Branch format with last-revision, tags, and a stacked location pointer.
2227
2228
    The stacked location pointer is passed down to the repository and requires
2229
    a repository format with supports_external_lookups = True.
2230
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
2231
    This format was introduced in bzr 1.6.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2232
    """
2233
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2234
    def initialize(self, a_bzrdir, name=None, repository=None,
2235
                   append_revisions_only=None):
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2236
        """Create a branch of this format in a_bzrdir."""
2237
        utf8_files = [('last-revision', '0 null:\n'),
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2238
                      ('branch.conf',
2239
                          self._get_initial_config(append_revisions_only)),
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2240
                      ('tags', ''),
2241
                      ]
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2242
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2243
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2244
    def _branch_class(self):
2245
        return BzrBranch7
2246
2247
    def get_format_string(self):
2248
        """See BranchFormat.get_format_string()."""
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
2249
        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2250
2251
    def get_format_description(self):
2252
        """See BranchFormat.get_format_description()."""
2253
        return "Branch format 7"
2254
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
2255
    def supports_set_append_revisions_only(self):
2256
        return True
2257
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2258
    def supports_stacking(self):
2259
        return True
2260
5757.1.4 by Jelmer Vernooij
Add bzrlib.repofmt.knitpack_repo to the blacklist in test_import_tariff.
2261
    def make_tags(self, branch):
2262
        """See bzrlib.branch.BranchFormat.make_tags()."""
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
2263
        return _mod_tag.BasicTags(branch)
5757.1.4 by Jelmer Vernooij
Add bzrlib.repofmt.knitpack_repo to the blacklist in test_import_tariff.
2264
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
2265
    supports_reference_locations = False
2266
2230.3.1 by Aaron Bentley
Get branch6 creation working
2267
6207.3.9 by Jelmer Vernooij
Fix _matchingbzrdir.
2268
class BranchReferenceFormat(BranchFormatMetadir):
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.
2269
    """Bzr branch reference format.
2270
2271
    Branch references are used in implementing checkouts, they
2272
    act as an alias to the real branch which is at some other url.
2273
2274
    This format has:
2275
     - A location file
2276
     - a format string
2277
    """
2278
2279
    def get_format_string(self):
2280
        """See BranchFormat.get_format_string()."""
2281
        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
2282
2283
    def get_format_description(self):
2284
        """See BranchFormat.get_format_description()."""
2285
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2286
5147.4.6 by Jelmer Vernooij
consistency in names
2287
    def get_reference(self, a_bzrdir, name=None):
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
2288
        """See BranchFormat.get_reference()."""
5147.4.6 by Jelmer Vernooij
consistency in names
2289
        transport = a_bzrdir.get_branch_transport(None, name=name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2290
        return transport.get_bytes('location')
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
2291
5147.4.6 by Jelmer Vernooij
consistency in names
2292
    def set_reference(self, a_bzrdir, name, to_branch):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
2293
        """See BranchFormat.set_reference()."""
5147.4.6 by Jelmer Vernooij
consistency in names
2294
        transport = a_bzrdir.get_branch_transport(None, name=name)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
2295
        location = transport.put_bytes('location', to_branch.base)
2296
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2297
    def initialize(self, a_bzrdir, name=None, target_branch=None,
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
2298
            repository=None, append_revisions_only=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.
2299
        """Create a branch of this format in a_bzrdir."""
2300
        if target_branch is None:
2301
            # this format does not implement branch itself, thus the implicit
2302
            # creation contract must see it as uninitializable
2303
            raise errors.UninitializableFormat(self)
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2304
        mutter('creating branch reference in %s', a_bzrdir.user_url)
6082.1.1 by Jelmer Vernooij
Don't attempt to create branch references in control directories that don't support it.
2305
        if a_bzrdir._format.fixed_components:
2306
            raise errors.IncompatibleFormat(self, a_bzrdir._format)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2307
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
2308
        branch_transport.put_bytes('location',
5268.8.8 by Jelmer Vernooij
Use branch URL for branch references, not bzrdir URL.
2309
            target_branch.user_url)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
2310
        branch_transport.put_bytes('format', self.get_format_string())
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
2311
        branch = self.open(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2312
            a_bzrdir, name, _found=True,
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2313
            possible_transports=[target_branch.bzrdir.root_transport])
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2314
        self._run_post_branch_init_hooks(a_bzrdir, name, branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
2315
        return branch
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.
2316
2317
    def _make_reference_clone_function(format, a_branch):
2318
        """Create a clone() routine for a branch dynamically."""
4050.1.3 by Robert Collins
Add missed new parameter for branch reference cloning.
2319
        def clone(to_bzrdir, revision_id=None,
2320
            repository_policy=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.
2321
            """See Branch.clone()."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2322
            return format.initialize(to_bzrdir, target_branch=a_branch)
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.
2323
            # cannot obey revision_id limits when cloning a reference ...
2324
            # FIXME RBC 20060210 either nuke revision_id for clone, or
2325
            # emit some sort of warning/error to the caller ?!
2326
        return clone
2327
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2328
    def open(self, a_bzrdir, name=None, _found=False, location=None,
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
2329
             possible_transports=None, ignore_fallbacks=False,
2330
             found_repository=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.
2331
        """Return the branch that the branch reference in a_bzrdir points at.
2332
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2333
        :param a_bzrdir: A BzrDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2334
        :param name: Name of colocated branch to open, if any
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2335
        :param _found: a private parameter, do not use it. It is used to
2336
            indicate if format probing has already be done.
2337
        :param ignore_fallbacks: when set, no fallback branches will be opened
2338
            (if there are any).  Default is to open fallbacks.
2339
        :param location: The location of the referenced branch.  If
2340
            unspecified, this will be determined from the branch reference in
2341
            a_bzrdir.
2342
        :param possible_transports: An optional reusable transports list.
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.
2343
        """
2344
        if not _found:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2345
            format = BranchFormat.find_format(a_bzrdir, name=name)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2346
            if format.__class__ != self.__class__:
2347
                raise AssertionError("wrong format %r found for %r" %
2348
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
2349
        if location is None:
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
2350
            location = self.get_reference(a_bzrdir, name)
6207.3.3 by jelmer at samba
Fix tests and the like.
2351
        real_bzrdir = controldir.ControlDir.open(
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2352
            location, possible_transports=possible_transports)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2353
        result = real_bzrdir.open_branch(name=name, 
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2354
            ignore_fallbacks=ignore_fallbacks,
2355
            possible_transports=possible_transports)
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.
2356
        # this changes the behaviour of result.clone to create a new reference
2357
        # rather than a copy of the content of the branch.
2358
        # I did not use a proxy object because that needs much more extensive
2359
        # testing, and we are only changing one behaviour at the moment.
2360
        # If we decide to alter more behaviours - i.e. the implicit nickname
2361
        # then this should be refactored to introduce a tested proxy branch
2362
        # and a subclass of that for use in overriding clone() and ....
2363
        # - RBC 20060210
2364
        result.clone = self._make_reference_clone_function(result)
2365
        return result
2366
2367
5669.3.9 by Jelmer Vernooij
Consistent naming.
2368
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
2369
    """Branch format registry."""
2370
2371
    def __init__(self, other_registry=None):
2372
        super(BranchFormatRegistry, self).__init__(other_registry)
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
2373
        self._default_format = None
2374
2375
    def set_default(self, format):
2376
        self._default_format = format
2377
2378
    def get_default(self):
2379
        return self._default_format
2380
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
2381
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2382
network_format_registry = registry.FormatRegistry()
2383
"""Registry of formats indexed by their network name.
2384
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2385
The network name for a branch format is an identifier that can be used when
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2386
referring to formats with smart server operations. See
2387
BranchFormat.network_name() for more detail.
2388
"""
2389
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
2390
format_registry = BranchFormatRegistry(network_format_registry)
2391
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2392
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2393
# formats which have no format string are not discoverable
2394
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
2395
__format5 = BzrBranchFormat5()
2396
__format6 = BzrBranchFormat6()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2397
__format7 = BzrBranchFormat7()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2398
__format8 = BzrBranchFormat8()
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
2399
format_registry.register(__format5)
2400
format_registry.register(BranchReferenceFormat())
2401
format_registry.register(__format6)
2402
format_registry.register(__format7)
2403
format_registry.register(__format8)
2404
format_registry.set_default(__format7)
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2405
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
2406
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2407
class BranchWriteLockResult(LogicalLockResult):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2408
    """The result of write locking a branch.
2409
2410
    :ivar branch_token: The token obtained from the underlying branch lock, or
2411
        None.
2412
    :ivar unlock: A callable which will unlock the lock.
2413
    """
2414
2415
    def __init__(self, unlock, branch_token):
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2416
        LogicalLockResult.__init__(self, unlock)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2417
        self.branch_token = branch_token
2418
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2419
    def __repr__(self):
5200.3.5 by Robert Collins
Add __str__ to the new helper classes.
2420
        return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2421
            self.unlock)
2422
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2423
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2424
class BzrBranch(Branch, _RelockDebugMixin):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
2425
    """A branch stored in the actual filesystem.
2426
2427
    Note that it's "local" in the context of the filesystem; it doesn't
2428
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
2429
    it's writable, and can be accessed via the normal filesystem API.
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2430
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2431
    :ivar _transport: Transport for file operations on this branch's
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2432
        control files, typically pointing to the .bzr/branch directory.
2433
    :ivar repository: Repository for this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2434
    :ivar base: The url of the base directory for this branch; the one
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2435
        containing the .bzr directory.
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2436
    :ivar name: Optional colocated branch name as it exists in the control
2437
        directory.
1 by mbp at sourcefrog
import from baz patch-364
2438
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2439
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
2440
    def __init__(self, _format=None,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2441
                 _control_files=None, a_bzrdir=None, name=None,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2442
                 _repository=None, ignore_fallbacks=False,
2443
                 possible_transports=None):
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
2444
        """Create new branch object at a particular location."""
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2445
        if a_bzrdir is None:
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
2446
            raise ValueError('a_bzrdir must be supplied')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2447
        else:
2448
            self.bzrdir = a_bzrdir
6240.2.3 by Jelmer Vernooij
Actually modify transport rather than just URLs.
2449
        self._user_transport = self.bzrdir.transport.clone('..')
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
2450
        if name is not None:
6240.2.3 by Jelmer Vernooij
Actually modify transport rather than just URLs.
2451
            self._user_transport.set_segment_parameter(
6240.2.6 by Jelmer Vernooij
use urlutils.escape.
2452
                "branch", urlutils.escape(name))
6240.2.3 by Jelmer Vernooij
Actually modify transport rather than just URLs.
2453
        self._base = self._user_transport.base
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2454
        self.name = name
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2455
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
2456
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2457
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
2458
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2459
        self._transport = _control_files._transport
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
2460
        self.repository = _repository
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2461
        Branch.__init__(self, possible_transports)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
2462
1 by mbp at sourcefrog
import from baz patch-364
2463
    def __str__(self):
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
2464
        return '%s(%s)' % (self.__class__.__name__, self.user_url)
1 by mbp at sourcefrog
import from baz patch-364
2465
2466
    __repr__ = __str__
2467
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2468
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2469
        """Returns the directory containing the control directory."""
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
2470
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2471
1442.1.5 by Robert Collins
Give branch.base a docstring.
2472
    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,
2473
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
2474
    @property
6240.2.3 by Jelmer Vernooij
Actually modify transport rather than just URLs.
2475
    def user_transport(self):
2476
        return self._user_transport
6240.2.2 by Jelmer Vernooij
Put the branch name into the branch URL.
2477
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2478
    def _get_config(self):
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
2479
        return _mod_config.TransportConfig(self._transport, 'branch.conf')
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2480
6270.1.19 by Jelmer Vernooij
Some changes discussed with vila on IRC.
2481
    def _get_config_store(self):
2482
        return _mod_config.BranchStore(self)
2483
1694.2.6 by Martin Pool
[merge] bzr.dev
2484
    def is_locked(self):
2485
        return self.control_files.is_locked()
2486
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
2487
    def lock_write(self, token=None):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2488
        """Lock the branch for write operations.
2489
2490
        :param token: A token to permit reacquiring a previously held and
2491
            preserved lock.
2492
        :return: A BranchWriteLockResult.
2493
        """
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2494
        if not self.is_locked():
2495
            self._note_lock('w')
4288.1.12 by Robert Collins
Review feedback.
2496
        # All-in-one needs to always unlock/lock.
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2497
        repo_control = getattr(self.repository, 'control_files', None)
4288.1.11 by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent).
2498
        if self.control_files == repo_control or not self.is_locked():
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
2499
            self.repository._warn_if_deprecated(self)
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2500
            self.repository.lock_write()
2501
            took_lock = True
2502
        else:
2503
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2504
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2505
            return BranchWriteLockResult(self.unlock,
2506
                self.control_files.lock_write(token=token))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2507
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2508
            if took_lock:
2509
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2510
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2511
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
2512
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2513
        """Lock the branch for read operations.
2514
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2515
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2516
        """
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2517
        if not self.is_locked():
2518
            self._note_lock('r')
4288.1.12 by Robert Collins
Review feedback.
2519
        # All-in-one needs to always unlock/lock.
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2520
        repo_control = getattr(self.repository, 'control_files', None)
4288.1.11 by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent).
2521
        if self.control_files == repo_control or not self.is_locked():
4840.2.7 by Vincent Ladeuil
Move the _warn_if_deprecated call from repo.__init__ to
2522
            self.repository._warn_if_deprecated(self)
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2523
            self.repository.lock_read()
2524
            took_lock = True
2525
        else:
2526
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2527
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
2528
            self.control_files.lock_read()
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2529
            return LogicalLockResult(self.unlock)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2530
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2531
            if took_lock:
2532
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2533
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2534
4634.85.11 by Andrew Bennetts
Suppress most errors from Branch.unlock too.
2535
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2536
    def unlock(self):
4288.1.11 by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent).
2537
        try:
2538
            self.control_files.unlock()
2539
        finally:
4288.1.12 by Robert Collins
Review feedback.
2540
            # All-in-one needs to always unlock/lock.
4288.1.11 by Robert Collins
Hopefully fix locking tests to match the new code (and still be good statements of intent).
2541
            repo_control = getattr(self.repository, 'control_files', None)
2542
            if (self.control_files == repo_control or
2543
                not self.control_files.is_locked()):
2544
                self.repository.unlock()
2545
            if not self.control_files.is_locked():
2546
                # we just released the lock
2547
                self._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2548
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
2549
    def peek_lock_mode(self):
2550
        if self.control_files._lock_count == 0:
2551
            return None
2552
        else:
2553
            return self.control_files._lock_mode
2554
1694.2.6 by Martin Pool
[merge] bzr.dev
2555
    def get_physical_lock_status(self):
2556
        return self.control_files.get_physical_lock_status()
2557
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
2558
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2559
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2560
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2561
        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.
2562
5718.7.15 by Jelmer Vernooij
Decorate _set_revision_history rather than set_revision_history.
2563
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2564
    def set_last_revision_info(self, revno, revision_id):
5718.8.12 by Jelmer Vernooij
Fix raising of InvalidRevisionId.
2565
        if not revision_id or not isinstance(revision_id, basestring):
2566
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
5718.8.3 by Jelmer Vernooij
More branch restructuring.
2567
        revision_id = _mod_revision.ensure_null(revision_id)
2568
        old_revno, old_revid = self.last_revision_info()
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
2569
        if self.get_append_revisions_only():
5718.8.3 by Jelmer Vernooij
More branch restructuring.
2570
            self._check_history_violation(revision_id)
2571
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2572
        self._write_last_revision_info(revno, revision_id)
2573
        self._clear_cached_state()
2574
        self._last_revision_info_cache = revno, revision_id
2575
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.4.1 by Aaron Bentley
Get log as fast branch5
2576
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2577
    def basis_tree(self):
2578
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2579
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2580
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2581
    def _get_parent_location(self):
2582
        _locs = ['parent', 'pull', 'x-pull']
2583
        for l in _locs:
2584
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2585
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
2586
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2587
                pass
2588
        return None
2589
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2590
    def get_stacked_on_url(self):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2591
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2592
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2593
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2594
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
2595
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
2596
            'push_location', location,
2597
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2598
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2599
    def _set_parent_location(self, url):
2600
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2601
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2602
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2603
            self._transport.put_bytes('parent', url + '\n',
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2604
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
2605
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2606
    @needs_write_lock
2607
    def unbind(self):
2608
        """If bound, unbind"""
2609
        return self.set_bound_location(None)
2610
2611
    @needs_write_lock
2612
    def bind(self, other):
2613
        """Bind this branch to the branch other.
2614
2615
        This does not push or pull data between the branches, though it does
2616
        check for divergence to raise an error when the branches are not
2617
        either the same, or one a prefix of the other. That behaviour may not
2618
        be useful, so that check may be removed in future.
2619
2620
        :param other: The branch to bind to
2621
        :type other: Branch
2622
        """
2623
        # TODO: jam 20051230 Consider checking if the target is bound
2624
        #       It is debatable whether you should be able to bind to
2625
        #       a branch which is itself bound.
2626
        #       Committing is obviously forbidden,
2627
        #       but binding itself may not be.
2628
        #       Since we *have* to check at commit time, we don't
2629
        #       *need* to check here
2630
2631
        # we want to raise diverged if:
2632
        # last_rev is not in the other_last_rev history, AND
2633
        # other_last_rev is not in our history, and do it without pulling
2634
        # history around
2635
        self.set_bound_location(other.base)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2636
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2637
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2638
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
2639
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2640
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2641
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2642
2643
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2644
    def get_master_branch(self, possible_transports=None):
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2645
        """Return the branch we are bound to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2646
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2647
        :return: Either a Branch, or None
2648
        """
5609.25.3 by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock.
2649
        if self._master_branch_cache is None:
2650
            self._master_branch_cache = self._get_master_branch(
2651
                possible_transports)
2652
        return self._master_branch_cache
2653
2654
    def _get_master_branch(self, possible_transports):
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2655
        bound_loc = self.get_bound_location()
2656
        if not bound_loc:
2657
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2658
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2659
            return Branch.open(bound_loc,
2660
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2661
        except (errors.NotBranchError, errors.ConnectionError), e:
2662
            raise errors.BoundBranchConnectionFailure(
2663
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2664
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
2665
    @needs_write_lock
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2666
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
2667
        """Set the target where this branch is bound to.
2668
2669
        :param location: URL to the target branch
2670
        """
5609.25.3 by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock.
2671
        self._master_branch_cache = None
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
2672
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2673
            self._transport.put_bytes('bound', location+'\n',
2674
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
2675
        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.
2676
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2677
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
2678
            except errors.NoSuchFile:
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
2679
                return False
2680
            return True
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2681
1587.1.10 by Robert Collins
update updates working tree and branch together.
2682
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2683
    def update(self, possible_transports=None):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2684
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
2685
2686
        :return: None or the last_revision that was pivoted out during the
2687
                 update.
2688
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2689
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
2690
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2691
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
2692
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2693
            if self.repository.get_graph().is_ancestor(old_tip,
2694
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
2695
                return None
2696
            return old_tip
2697
        return None
2698
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2699
    def _read_last_revision_info(self):
2700
        revision_string = self._transport.get_bytes('last-revision')
2701
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2702
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2703
        revno = int(revno)
2704
        return revno, revision_id
2705
2706
    def _write_last_revision_info(self, revno, revision_id):
2707
        """Simply write out the revision id, with no checks.
2708
2709
        Use set_last_revision_info to perform this safely.
2710
2711
        Does not update the revision_history cache.
2712
        """
2713
        revision_id = _mod_revision.ensure_null(revision_id)
2714
        out_string = '%d %s\n' % (revno, revision_id)
2715
        self._transport.put_bytes('last-revision', out_string,
2716
            mode=self.bzrdir._get_file_mode())
2717
2718
2719
class FullHistoryBzrBranch(BzrBranch):
2720
    """Bzr branch which contains the full revision history."""
2721
2722
    @needs_write_lock
2723
    def set_last_revision_info(self, revno, revision_id):
5718.8.12 by Jelmer Vernooij
Fix raising of InvalidRevisionId.
2724
        if not revision_id or not isinstance(revision_id, basestring):
2725
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2726
        revision_id = _mod_revision.ensure_null(revision_id)
2727
        # this old format stores the full history, but this api doesn't
2728
        # provide it, so we must generate, and might as well check it's
2729
        # correct
2730
        history = self._lefthand_history(revision_id)
2731
        if len(history) != revno:
2732
            raise AssertionError('%d != %d' % (len(history), revno))
2733
        self._set_revision_history(history)
2734
2735
    def _read_last_revision_info(self):
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
2736
        rh = self._revision_history()
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2737
        revno = len(rh)
2738
        if revno:
2739
            return (revno, rh[-1])
2740
        else:
2741
            return (0, _mod_revision.NULL_REVISION)
2742
2743
    @deprecated_method(deprecated_in((2, 4, 0)))
2744
    @needs_write_lock
2745
    def set_revision_history(self, rev_history):
2746
        """See Branch.set_revision_history."""
2747
        self._set_revision_history(rev_history)
2748
2749
    def _set_revision_history(self, rev_history):
2750
        if 'evil' in debug.debug_flags:
2751
            mutter_callsite(3, "set_revision_history scales with history.")
2752
        check_not_reserved_id = _mod_revision.check_not_reserved_id
2753
        for rev_id in rev_history:
2754
            check_not_reserved_id(rev_id)
2755
        if Branch.hooks['post_change_branch_tip']:
2756
            # Don't calculate the last_revision_info() if there are no hooks
2757
            # that will use it.
2758
            old_revno, old_revid = self.last_revision_info()
2759
        if len(rev_history) == 0:
2760
            revid = _mod_revision.NULL_REVISION
2761
        else:
2762
            revid = rev_history[-1]
2763
        self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2764
        self._write_revision_history(rev_history)
2765
        self._clear_cached_state()
2766
        self._cache_revision_history(rev_history)
2767
        for hook in Branch.hooks['set_rh']:
2768
            hook(self, rev_history)
2769
        if Branch.hooks['post_change_branch_tip']:
2770
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2771
2772
    def _write_revision_history(self, history):
2773
        """Factored out of set_revision_history.
2774
2775
        This performs the actual writing to disk.
2776
        It is intended to be called by set_revision_history."""
2777
        self._transport.put_bytes(
2778
            'revision-history', '\n'.join(history),
2779
            mode=self.bzrdir._get_file_mode())
2780
2781
    def _gen_revision_history(self):
2782
        history = self._transport.get_bytes('revision-history').split('\n')
2783
        if history[-1:] == ['']:
2784
            # There shouldn't be a trailing newline, but just in case.
2785
            history.pop()
2786
        return history
2787
2788
    def _synchronize_history(self, destination, revision_id):
5718.8.11 by Jelmer Vernooij
Fix _synchronize_history check.
2789
        if not isinstance(destination, FullHistoryBzrBranch):
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2790
            super(BzrBranch, self)._synchronize_history(
2791
                destination, revision_id)
2792
            return
2793
        if revision_id == _mod_revision.NULL_REVISION:
2794
            new_history = []
2795
        else:
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
2796
            new_history = self._revision_history()
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2797
        if revision_id is not None and new_history != []:
2798
            try:
2799
                new_history = new_history[:new_history.index(revision_id) + 1]
2800
            except ValueError:
2801
                rev = self.repository.get_revision(revision_id)
2802
                new_history = rev.get_history(self.repository)[1:]
2803
        destination._set_revision_history(new_history)
2804
5718.8.6 by Jelmer Vernooij
Move generate_revision_history.
2805
    @needs_write_lock
2806
    def generate_revision_history(self, revision_id, last_rev=None,
2807
        other_branch=None):
2808
        """Create a new revision history that will finish with revision_id.
2809
2810
        :param revision_id: the new tip to use.
2811
        :param last_rev: The previous last_revision. If not None, then this
2812
            must be a ancestory of revision_id, or DivergedBranches is raised.
2813
        :param other_branch: The other branch that DivergedBranches should
2814
            raise with respect to.
2815
        """
2816
        self._set_revision_history(self._lefthand_history(revision_id,
2817
            last_rev, other_branch))
2818
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2819
2820
class BzrBranch5(FullHistoryBzrBranch):
2821
    """A format 5 branch. This supports new features over plain branches.
2822
2823
    It has support for a master_branch which is the data for bound branches.
2824
    """
2825
2826
2827
class BzrBranch8(BzrBranch):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2828
    """A branch that stores tree-reference locations."""
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2829
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2830
    def _open_hook(self, possible_transports=None):
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2831
        if self._ignore_fallbacks:
2832
            return
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2833
        if possible_transports is None:
6305.3.5 by Jelmer Vernooij
Avoid .control_transport, as it triggers _ensure_real.
2834
            possible_transports = [self.bzrdir.root_transport]
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2835
        try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2836
            url = self.get_stacked_on_url()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2837
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2838
            errors.UnstackableBranchFormat):
2839
            pass
2840
        else:
3770.2.1 by Michael Hudson
test and feature
2841
            for hook in Branch.hooks['transform_fallback_location']:
2842
                url = hook(self, url)
3770.2.3 by Michael Hudson
check for None being returned for a hook
2843
                if url is None:
2844
                    hook_name = Branch.hooks.get_hook_name(hook)
2845
                    raise AssertionError(
2846
                        "'transform_fallback_location' hook %s returned "
2847
                        "None, not a URL." % hook_name)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
2848
            self._activate_fallback_location(url,
2849
                possible_transports=possible_transports)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2850
4160.2.8 by Andrew Bennetts
Slightly less messy BzrBranch7.__init__.
2851
    def __init__(self, *args, **kwargs):
2852
        self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2853
        super(BzrBranch8, self).__init__(*args, **kwargs)
3060.3.1 by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again.
2854
        self._last_revision_info_cache = None
4273.1.15 by Aaron Bentley
Add reference_info caching.
2855
        self._reference_info = None
3060.3.1 by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again.
2856
2857
    def _clear_cached_state(self):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2858
        super(BzrBranch8, self)._clear_cached_state()
3060.3.1 by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again.
2859
        self._last_revision_info_cache = None
4273.1.15 by Aaron Bentley
Add reference_info caching.
2860
        self._reference_info = None
3060.3.1 by Lukáš Lalinský
Cache last_revision_info in BzrBranch6, since this is often called multiple times within one lock and we don't want to read the file over and over again.
2861
2230.3.32 by Aaron Bentley
Implement strict history policy
2862
    def _check_history_violation(self, revision_id):
5718.8.23 by Jelmer Vernooij
Avoid Branch._lefthand_history when checking for history violations.
2863
        current_revid = self.last_revision()
2864
        last_revision = _mod_revision.ensure_null(current_revid)
2598.5.2 by Aaron Bentley
Got all tests passing with Branch returning 'null:' for null revision
2865
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
2866
            return
5718.8.23 by Jelmer Vernooij
Avoid Branch._lefthand_history when checking for history violations.
2867
        graph = self.repository.get_graph()
2868
        for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2869
            if lh_ancestor == current_revid:
2870
                return
2871
        raise errors.AppendRevisionsOnlyViolation(self.user_url)
2230.3.32 by Aaron Bentley
Implement strict history policy
2872
2230.4.1 by Aaron Bentley
Get log as fast branch5
2873
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2874
        """Generate the revision history from last revision
2875
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2876
        last_revno, last_revision = self.last_revision_info()
2877
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2878
        return list(reversed(self._partial_revision_history_cache))
2879
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2880
    @needs_write_lock
2881
    def _set_parent_location(self, url):
2882
        """Set the parent branch"""
2883
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2884
2885
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2886
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2887
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2888
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2889
4273.1.15 by Aaron Bentley
Add reference_info caching.
2890
    @needs_write_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2891
    def _set_all_reference_info(self, info_dict):
2892
        """Replace all reference info stored in a branch.
2893
2894
        :param info_dict: A dict of {file_id: (tree_path, branch_location)}
2895
        """
2896
        s = StringIO()
2897
        writer = rio.RioWriter(s)
2898
        for key, (tree_path, branch_location) in info_dict.iteritems():
2899
            stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2900
                                branch_location=branch_location)
2901
            writer.write_stanza(stanza)
2902
        self._transport.put_bytes('references', s.getvalue())
4273.1.15 by Aaron Bentley
Add reference_info caching.
2903
        self._reference_info = info_dict
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2904
4273.1.15 by Aaron Bentley
Add reference_info caching.
2905
    @needs_read_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2906
    def _get_all_reference_info(self):
2907
        """Return all the reference info stored in a branch.
2908
2909
        :return: A dict of {file_id: (tree_path, branch_location)}
2910
        """
4273.1.15 by Aaron Bentley
Add reference_info caching.
2911
        if self._reference_info is not None:
2912
            return self._reference_info
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2913
        rio_file = self._transport.get('references')
2914
        try:
2915
            stanzas = rio.read_stanzas(rio_file)
2916
            info_dict = dict((s['file_id'], (s['tree_path'],
2917
                             s['branch_location'])) for s in stanzas)
2918
        finally:
2919
            rio_file.close()
4273.1.15 by Aaron Bentley
Add reference_info caching.
2920
        self._reference_info = info_dict
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2921
        return info_dict
2922
2923
    def set_reference_info(self, file_id, tree_path, branch_location):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2924
        """Set the branch location to use for a tree reference.
2925
2926
        :param file_id: The file-id of the tree reference.
2927
        :param tree_path: The path of the tree reference in the tree.
2928
        :param branch_location: The location of the branch to retrieve tree
2929
            references from.
2930
        """
2931
        info_dict = self._get_all_reference_info()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2932
        info_dict[file_id] = (tree_path, branch_location)
2933
        if None in (tree_path, branch_location):
2934
            if tree_path is not None:
2935
                raise ValueError('tree_path must be None when branch_location'
2936
                                 ' is None.')
2937
            if branch_location is not None:
2938
                raise ValueError('branch_location must be None when tree_path'
2939
                                 ' is None.')
2940
            del info_dict[file_id]
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2941
        self._set_all_reference_info(info_dict)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2942
2943
    def get_reference_info(self, file_id):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2944
        """Get the tree_path and branch_location for a tree reference.
2945
2946
        :return: a tuple of (tree_path, branch_location)
2947
        """
2948
        return self._get_all_reference_info().get(file_id, (None, None))
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2949
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2950
    def reference_parent(self, file_id, path, possible_transports=None):
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2951
        """Return the parent branch for a tree-reference file_id.
2952
2953
        :param file_id: The file_id of the tree reference
2954
        :param path: The path of the file_id in the tree
2955
        :return: A branch associated with the file_id
2956
        """
2957
        branch_location = self.get_reference_info(file_id)[1]
2958
        if branch_location is None:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2959
            return Branch.reference_parent(self, file_id, path,
2960
                                           possible_transports)
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2961
        branch_location = urlutils.join(self.user_url, branch_location)
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2962
        return Branch.open(branch_location,
2963
                           possible_transports=possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2964
2230.3.3 by Aaron Bentley
Add more config testing
2965
    def set_push_location(self, location):
2966
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2967
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2968
2969
    def set_bound_location(self, location):
2970
        """See Branch.set_push_location."""
5609.25.5 by Andrew Bennetts
Add tests that get_master_branch isn't cached when it shouldn't be, and fix a bug that reveals.
2971
        self._master_branch_cache = None
2230.3.7 by Aaron Bentley
Fix binding return values
2972
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2973
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2974
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2975
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2976
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2977
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2978
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2979
                return True
2980
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2981
            self._set_config_location('bound_location', location,
2982
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2983
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2984
        return True
2985
2986
    def _get_bound_location(self, bound):
2987
        """Return the bound location in the config file.
2988
2989
        Return None if the bound parameter does not match"""
2990
        config = self.get_config()
2991
        config_bound = (config.get_user_option('bound') == 'True')
2992
        if config_bound != bound:
2993
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2994
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2995
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2996
    def get_bound_location(self):
2997
        """See Branch.set_push_location."""
2998
        return self._get_bound_location(True)
2999
3000
    def get_old_bound_location(self):
3001
        """See Branch.get_old_bound_location"""
3002
        return self._get_bound_location(False)
3003
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
3004
    def get_stacked_on_url(self):
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
3005
        # you can always ask for the URL; but you might not be able to use it
3006
        # if the repo can't support stacking.
3007
        ## self._check_stackable_repo()
5993.4.1 by Andrew Bennetts
Make Branch.open more than 3x faster.
3008
        # stacked_on_location is only ever defined in branch.conf, so don't
3009
        # waste effort reading the whole stack of config files.
3010
        config = self.get_config()._get_branch_data_config()
3011
        stacked_url = self._get_config_location('stacked_on_location',
3012
            config=config)
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
3013
        if stacked_url is None:
3221.11.6 by Robert Collins
Stackable branch fixes.
3014
            raise errors.NotStacked(self)
3015
        return stacked_url
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3016
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
3017
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
3018
    def get_rev_id(self, revno, history=None):
3019
        """Find the revision id of the specified revno."""
3020
        if revno == 0:
3021
            return _mod_revision.NULL_REVISION
3022
3023
        last_revno, last_revision_id = self.last_revision_info()
3024
        if revno <= 0 or revno > last_revno:
3025
            raise errors.NoSuchRevision(self, revno)
3026
3027
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
3028
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
3029
3298.2.10 by Aaron Bentley
Refactor partial history code
3030
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
3031
        if len(self._partial_revision_history_cache) <= index:
3032
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
3033
        if len(self._partial_revision_history_cache) > index:
3034
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
3035
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
3036
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
3037
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
3038
    @needs_read_lock
3039
    def revision_id_to_revno(self, revision_id):
3040
        """Given a revision id, return its revno"""
3041
        if _mod_revision.is_null(revision_id):
3042
            return 0
3043
        try:
3044
            index = self._partial_revision_history_cache.index(revision_id)
3045
        except ValueError:
5689.2.1 by Jelmer Vernooij
Properly raise GhostsHaveNoRevno in revision_id_to_revno.
3046
            try:
3047
                self._extend_partial_history(stop_revision=revision_id)
3048
            except errors.RevisionNotPresent, e:
3049
                raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
3050
            index = len(self._partial_revision_history_cache) - 1
6263.1.1 by Jelmer Vernooij
Support looking up revision numbers by revision id in empty branches.
3051
            if index < 0:
3052
                raise errors.NoSuchRevision(self, revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
3053
            if self._partial_revision_history_cache[index] != revision_id:
3054
                raise errors.NoSuchRevision(self, revision_id)
3055
        return self.revno() - index
3056
2230.3.34 by Aaron Bentley
cleanup
3057
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
3058
class BzrBranch7(BzrBranch8):
3059
    """A branch with support for a fallback repository."""
3060
3061
    def set_reference_info(self, file_id, tree_path, branch_location):
3062
        Branch.set_reference_info(self, file_id, tree_path, branch_location)
3063
3064
    def get_reference_info(self, file_id):
3065
        Branch.get_reference_info(self, file_id)
3066
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
3067
    def reference_parent(self, file_id, path, possible_transports=None):
3068
        return Branch.reference_parent(self, file_id, path,
3069
                                       possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
3070
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
3071
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3072
class BzrBranch6(BzrBranch7):
3073
    """See BzrBranchFormat6 for the capabilities of this branch.
3074
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
3075
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
3076
    i.e. stacking.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3077
    """
3078
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
3079
    def get_stacked_on_url(self):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
3080
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3081
3082
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3083
######################################################################
3084
# results of operations
3085
2220.2.37 by Martin Pool
Report conflicting tags from push.
3086
3087
class _Result(object):
3088
3089
    def _show_tag_conficts(self, to_file):
3090
        if not getattr(self, 'tag_conflicts', None):
3091
            return
3092
        to_file.write('Conflicting tags:\n')
3093
        for name, value1, value2 in self.tag_conflicts:
3094
            to_file.write('    %s\n' % (name, ))
3095
3096
3097
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3098
    """Result of a Branch.pull operation.
3099
3100
    :ivar old_revno: Revision number before pull.
3101
    :ivar new_revno: Revision number after pull.
3102
    :ivar old_revid: Tip revision id before pull.
3103
    :ivar new_revid: Tip revision id after pull.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3104
    :ivar source_branch: Source (local) branch object. (read locked)
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
3105
    :ivar master_branch: Master branch of the target, or the target if no
3106
        Master
3107
    :ivar local_branch: target branch if there is a Master, else None
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3108
    :ivar target_branch: Target/destination branch object. (write locked)
3482.1.1 by John Arbash Meinel
Fix bug #238149, RemoteBranch.pull needs to return the _real_branch's pull result.
3109
    :ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
6112.4.1 by Jelmer Vernooij
Show how many tags have been updated in bzr pull.
3110
    :ivar tag_updates: A dict with new tags, see BasicTags.merge_to
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3111
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3112
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3113
    @deprecated_method(deprecated_in((2, 3, 0)))
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
3114
    def __int__(self):
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3115
        """Return the relative change in revno.
3116
3117
        :deprecated: Use `new_revno` and `old_revno` instead.
3118
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3119
        return self.new_revno - self.old_revno
3120
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
3121
    def report(self, to_file):
6112.4.3 by Jelmer Vernooij
Fix push tests.
3122
        tag_conflicts = getattr(self, "tag_conflicts", None)
3123
        tag_updates = getattr(self, "tag_updates", None)
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
3124
        if not is_quiet():
6112.4.1 by Jelmer Vernooij
Show how many tags have been updated in bzr pull.
3125
            if self.old_revid != self.new_revid:
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
3126
                to_file.write('Now on revision %d.\n' % self.new_revno)
6112.4.3 by Jelmer Vernooij
Fix push tests.
3127
            if tag_updates:
3128
                to_file.write('%d tag(s) updated.\n' % len(tag_updates))
3129
            if self.old_revid == self.new_revid and not tag_updates:
3130
                if not tag_conflicts:
6112.4.1 by Jelmer Vernooij
Show how many tags have been updated in bzr pull.
3131
                    to_file.write('No revisions or tags to pull.\n')
3132
                else:
3133
                    to_file.write('No revisions to pull.\n')
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
3134
        self._show_tag_conficts(to_file)
3135
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3136
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
3137
class BranchPushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3138
    """Result of a Branch.push operation.
3139
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3140
    :ivar old_revno: Revision number (eg 10) of the target before push.
3141
    :ivar new_revno: Revision number (eg 12) of the target after push.
3142
    :ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3143
        before the push.
3144
    :ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3145
        after the push.
3146
    :ivar source_branch: Source branch object that the push was from. This is
3147
        read locked, and generally is a local (and thus low latency) branch.
3148
    :ivar master_branch: If target is a bound branch, the master branch of
3149
        target, or target itself. Always write locked.
3150
    :ivar target_branch: The direct Branch where data is being sent (write
3151
        locked).
3152
    :ivar local_branch: If the target is a bound branch this will be the
3153
        target, otherwise it will be None.
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3154
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3155
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3156
    @deprecated_method(deprecated_in((2, 3, 0)))
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3157
    def __int__(self):
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3158
        """Return the relative change in revno.
3159
3160
        :deprecated: Use `new_revno` and `old_revno` instead.
3161
        """
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
3162
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3163
2220.2.37 by Martin Pool
Report conflicting tags from push.
3164
    def report(self, to_file):
6112.4.5 by Jelmer Vernooij
Add note about bzr pull / bzr push output inconsistency.
3165
        # TODO: This function gets passed a to_file, but then
3166
        # ignores it and calls note() instead. This is also
3167
        # inconsistent with PullResult(), which writes to stdout.
3168
        # -- JRV20110901, bug #838853
6112.4.3 by Jelmer Vernooij
Fix push tests.
3169
        tag_conflicts = getattr(self, "tag_conflicts", None)
3170
        tag_updates = getattr(self, "tag_updates", None)
6112.4.2 by Jelmer Vernooij
Fix tag tests.
3171
        if not is_quiet():
3172
            if self.old_revid != self.new_revid:
6138.3.1 by Jonathan Riddell
use gettext() in more files
3173
                note(gettext('Pushed up to revision %d.') % self.new_revno)
6112.4.3 by Jelmer Vernooij
Fix push tests.
3174
            if tag_updates:
6143.1.1 by Jonathan Riddell
use ngettext for plurals
3175
                note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
6112.4.3 by Jelmer Vernooij
Fix push tests.
3176
            if self.old_revid == self.new_revid and not tag_updates:
3177
                if not tag_conflicts:
6138.3.1 by Jonathan Riddell
use gettext() in more files
3178
                    note(gettext('No new revisions or tags to push.'))
6112.4.2 by Jelmer Vernooij
Fix tag tests.
3179
                else:
6138.3.1 by Jonathan Riddell
use gettext() in more files
3180
                    note(gettext('No new revisions to push.'))
2220.2.37 by Martin Pool
Report conflicting tags from push.
3181
        self._show_tag_conficts(to_file)
3182
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3183
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3184
class BranchCheckResult(object):
3185
    """Results of checking branch consistency.
3186
3187
    :see: Branch.check
3188
    """
3189
3190
    def __init__(self, branch):
3191
        self.branch = branch
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
3192
        self.errors = []
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3193
3194
    def report_results(self, verbose):
3195
        """Report the check results via trace.note.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3196
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3197
        :param verbose: Requests more detailed display of what was checked,
3198
            if any.
3199
        """
6147.1.1 by Jonathan Riddell
use .format() instead of % for string formatting where there are multiple formats in one string to allow for translations
3200
        note(gettext('checked branch {0} format {1}').format(
3201
                                self.branch.user_url, self.branch._format))
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
3202
        for error in self.errors:
6138.3.1 by Jonathan Riddell
use gettext() in more files
3203
            note(gettext('found error:%s'), error)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3204
3205
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3206
class Converter5to6(object):
3207
    """Perform an in-place upgrade of format 5 to format 6"""
3208
3209
    def convert(self, branch):
3210
        # Data for 5 and 6 can peacefully coexist.
3211
        format = BzrBranchFormat6()
3212
        new_branch = format.open(branch.bzrdir, _found=True)
3213
3214
        # Copy source data into target
3331.1.15 by Andrew Bennetts
Use _write_last_revision_info rather than set_last_revision_info in Converter5to6, because we just want to write the last-revision file, not trigger hooks with half-converted branches.
3215
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3216
        new_branch.set_parent(branch.get_parent())
3217
        new_branch.set_bound_location(branch.get_bound_location())
3218
        new_branch.set_push_location(branch.get_push_location())
3219
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
3220
        # New branch has no tags by default
3221
        new_branch.tags._set_tag_dict({})
3222
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3223
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3224
        new_branch._transport.put_bytes('format',
3225
            format.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
3226
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3227
3228
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
3229
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3230
        try:
3231
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
3232
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3233
            pass
3234
        branch.set_bound_location(None)
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
3235
3236
3237
class Converter6to7(object):
3238
    """Perform an in-place upgrade of format 6 to format 7"""
3239
3240
    def convert(self, branch):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3241
        format = BzrBranchFormat7()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
3242
        branch._set_config_location('stacked_on_location', '')
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
3243
        # update target format
3221.13.5 by Ian Clatworthy
fix LockableFiles deprecations
3244
        branch._transport.put_bytes('format', format.get_format_string())
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
3245
3246
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3247
class Converter7to8(object):
5906.1.1 by Jelmer Vernooij
Remove unused constants, fix docstring.
3248
    """Perform an in-place upgrade of format 7 to format 8"""
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3249
3250
    def convert(self, branch):
3251
        format = BzrBranchFormat8()
3252
        branch._transport.put_bytes('references', '')
3253
        # update target format
3254
        branch._transport.put_bytes('format', format.get_format_string())
3255
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
3256
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3257
class InterBranch(InterObject):
3258
    """This class represents operations taking place between two branches.
3259
3260
    Its instances have methods like pull() and push() and contain
3261
    references to the source and target repositories these operations
3262
    can be carried out on.
3263
    """
3264
3265
    _optimisers = []
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3266
    """The available optimised InterBranch types."""
3267
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
3268
    @classmethod
3269
    def _get_branch_formats_to_test(klass):
3270
        """Return an iterable of format tuples for testing.
3271
        
3272
        :return: An iterable of (from_format, to_format) to use when testing
3273
            this InterBranch class. Each InterBranch class should define this
3274
            method itself.
3275
        """
3276
        raise NotImplementedError(klass._get_branch_formats_to_test)
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3277
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3278
    @needs_write_lock
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3279
    def pull(self, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3280
             possible_transports=None, local=False):
4000.5.10 by Jelmer Vernooij
Fix comment for InterBranch.pull.
3281
        """Mirror source into target branch.
3282
3283
        The target branch is considered to be 'local', having low latency.
3284
3285
        :returns: PullResult instance
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3286
        """
3287
        raise NotImplementedError(self.pull)
3288
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3289
    @needs_write_lock
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
3290
    def push(self, overwrite=False, stop_revision=None, lossy=False,
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3291
             _override_hook_source_branch=None):
3292
        """Mirror the source branch into the target branch.
3293
3294
        The source branch is considered to be 'local', having low latency.
3295
        """
3296
        raise NotImplementedError(self.push)
3297
5358.1.1 by Jelmer Vernooij
Add stub for InterBranch.copy_content_into.
3298
    @needs_write_lock
3299
    def copy_content_into(self, revision_id=None):
3300
        """Copy the content of source into target
3301
3302
        revision_id: if not None, the revision history in the new branch will
3303
                     be truncated to end with revision_id.
3304
        """
3305
        raise NotImplementedError(self.copy_content_into)
3306
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3307
    @needs_write_lock
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
3308
    def fetch(self, stop_revision=None, limit=None):
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3309
        """Fetch revisions.
3310
3311
        :param stop_revision: Last revision to fetch
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
3312
        :param limit: Optional rough limit of revisions to fetch
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3313
        """
3314
        raise NotImplementedError(self.fetch)
3315
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3316
3317
class GenericInterBranch(InterBranch):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3318
    """InterBranch implementation that uses public Branch functions."""
3319
3320
    @classmethod
3321
    def is_compatible(klass, source, target):
3322
        # GenericBranch uses the public API, so always compatible
3323
        return True
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3324
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
3325
    @classmethod
3326
    def _get_branch_formats_to_test(klass):
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
3327
        return [(format_registry.get_default(), format_registry.get_default())]
4000.5.3 by Jelmer Vernooij
Add tests for InterBranch.
3328
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3329
    @classmethod
3330
    def unwrap_format(klass, format):
3331
        if isinstance(format, remote.RemoteBranchFormat):
3332
            format._ensure_real()
3333
            return format._custom_format
5050.53.4 by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge.
3334
        return format
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3335
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3336
    @needs_write_lock
3337
    def copy_content_into(self, revision_id=None):
3338
        """Copy the content of source into target
3339
3340
        revision_id: if not None, the revision history in the new branch will
3341
                     be truncated to end with revision_id.
3342
        """
3343
        self.source.update_references(self.target)
3344
        self.source._synchronize_history(self.target, revision_id)
3345
        try:
3346
            parent = self.source.get_parent()
3347
        except errors.InaccessibleParent, e:
3348
            mutter('parent was not accessible to copy: %s', e)
3349
        else:
3350
            if parent:
3351
                self.target.set_parent(parent)
3352
        if self.source._push_should_merge_tags():
5284.4.3 by Robert Collins
Fix missed self.source change in copy_content_into.
3353
            self.source.tags.merge_to(self.target.tags)
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3354
3355
    @needs_write_lock
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
3356
    def fetch(self, stop_revision=None, limit=None):
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3357
        if self.target.base == self.source.base:
3358
            return (0, [])
3359
        self.source.lock_read()
3360
        try:
5741.1.6 by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch.
3361
            fetch_spec_factory = fetch.FetchSpecFactory()
3362
            fetch_spec_factory.source_branch = self.source
3363
            fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3364
            fetch_spec_factory.source_repo = self.source.repository
3365
            fetch_spec_factory.target_repo = self.target.repository
3366
            fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
3367
            fetch_spec_factory.limit = limit
5741.1.6 by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch.
3368
            fetch_spec = fetch_spec_factory.make_fetch_spec()
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3369
            return self.target.repository.fetch(self.source.repository,
5741.1.4 by Jelmer Vernooij
Change Branch.fetch to take fetch_tags argument rather than fetch_spec.
3370
                fetch_spec=fetch_spec)
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3371
        finally:
3372
            self.source.unlock()
3373
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
3374
    @needs_write_lock
3375
    def _update_revisions(self, stop_revision=None, overwrite=False,
5809.2.4 by Jelmer Vernooij
remove unused argument.
3376
            graph=None):
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3377
        other_revno, other_last_revision = self.source.last_revision_info()
3378
        stop_revno = None # unknown
3379
        if stop_revision is None:
3380
            stop_revision = other_last_revision
3381
            if _mod_revision.is_null(stop_revision):
3382
                # if there are no commits, we're done.
3383
                return
3384
            stop_revno = other_revno
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3385
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3386
        # what's the current last revision, before we fetch [and change it
3387
        # possibly]
3388
        last_rev = _mod_revision.ensure_null(self.target.last_revision())
3389
        # we fetch here so that we don't process data twice in the common
3390
        # case of having something to pull, and so that the check for
3391
        # already merged can operate on the just fetched graph, which will
3392
        # be cached in memory.
5741.1.8 by Jelmer Vernooij
Remove fetch_tags argument.
3393
        self.fetch(stop_revision=stop_revision)
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3394
        # Check to see if one is an ancestor of the other
3395
        if not overwrite:
3396
            if graph is None:
3397
                graph = self.target.repository.get_graph()
3398
            if self.target._check_if_descendant_or_diverged(
3399
                    stop_revision, last_rev, graph, self.source):
3400
                # stop_revision is a descendant of last_rev, but we aren't
3401
                # overwriting, so we're done.
3402
                return
3403
        if stop_revno is None:
3404
            if graph is None:
3405
                graph = self.target.repository.get_graph()
3406
            this_revno, this_last_revision = \
3407
                    self.target.last_revision_info()
3408
            stop_revno = graph.find_distance_to_null(stop_revision,
3409
                            [(other_last_revision, other_revno),
3410
                             (this_last_revision, this_revno)])
3411
        self.target.set_last_revision_info(stop_revno, stop_revision)
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3412
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3413
    @needs_write_lock
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3414
    def pull(self, overwrite=False, stop_revision=None,
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3415
             possible_transports=None, run_hooks=True,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3416
             _override_hook_target=None, local=False):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3417
        """Pull from source into self, updating my master if any.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3418
3419
        :param run_hooks: Private parameter - if false, this branch
3420
            is being called because it's the master of the primary branch,
3421
            so it should not run its hooks.
3422
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3423
        bound_location = self.target.get_bound_location()
3424
        if local and not bound_location:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3425
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3426
        master_branch = None
5609.50.1 by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files
3427
        source_is_master = False
3428
        if bound_location:
5609.50.2 by Vincent Ladeuil
Fix typos caught by Jonathan.
3429
            # bound_location comes from a config file, some care has to be
3430
            # taken to relate it to source.user_url
5609.50.1 by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files
3431
            normalized = urlutils.normalize_url(bound_location)
3432
            try:
3433
                relpath = self.source.user_transport.relpath(normalized)
3434
                source_is_master = (relpath == '')
3435
            except (errors.PathNotChild, errors.InvalidURL):
3436
                source_is_master = False
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3437
        if not local and bound_location and not source_is_master:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3438
            # not pulling from master, so we need to update master.
3439
            master_branch = self.target.get_master_branch(possible_transports)
3440
            master_branch.lock_write()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3441
        try:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3442
            if master_branch:
3443
                # pull from source into master.
3444
                master_branch.pull(self.source, overwrite, stop_revision,
3445
                    run_hooks=False)
3446
            return self._pull(overwrite,
3447
                stop_revision, _hook_master=master_branch,
3448
                run_hooks=run_hooks,
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3449
                _override_hook_target=_override_hook_target,
3450
                merge_tags_to_master=not source_is_master)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3451
        finally:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3452
            if master_branch:
3453
                master_branch.unlock()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3454
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
3455
    def push(self, overwrite=False, stop_revision=None, lossy=False,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3456
             _override_hook_source_branch=None):
3457
        """See InterBranch.push.
3458
3459
        This is the basic concrete implementation of push()
3460
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
3461
        :param _override_hook_source_branch: If specified, run the hooks
3462
            passing this Branch as the source, rather than self.  This is for
3463
            use of RemoteBranch, where push is delegated to the underlying
3464
            vfs-based Branch.
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3465
        """
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
3466
        if lossy:
3467
            raise errors.LossyPushToSameVCS(self.source, self.target)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3468
        # TODO: Public option to disable running hooks - should be trivial but
3469
        # needs tests.
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3470
3471
        op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3472
        op.add_cleanup(self.source.lock_read().unlock)
3473
        op.add_cleanup(self.target.lock_write().unlock)
3474
        return op.run(overwrite, stop_revision,
3475
            _override_hook_source_branch=_override_hook_source_branch)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3476
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3477
    def _basic_push(self, overwrite, stop_revision):
3478
        """Basic implementation of push without bound branches or hooks.
3479
3480
        Must be called with source read locked and target write locked.
3481
        """
3482
        result = BranchPushResult()
3483
        result.source_branch = self.source
3484
        result.target_branch = self.target
3485
        result.old_revno, result.old_revid = self.target.last_revision_info()
3486
        self.source.update_references(self.target)
3487
        if result.old_revid != stop_revision:
3488
            # We assume that during 'push' this repository is closer than
3489
            # the target.
3490
            graph = self.source.repository.get_graph(self.target.repository)
3491
            self._update_revisions(stop_revision, overwrite=overwrite,
3492
                    graph=graph)
3493
        if self.source._push_should_merge_tags():
6112.4.4 by Jelmer Vernooij
Fix long lines.
3494
            result.tag_updates, result.tag_conflicts = (
3495
                self.source.tags.merge_to(self.target.tags, overwrite))
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3496
        result.new_revno, result.new_revid = self.target.last_revision_info()
3497
        return result
3498
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3499
    def _push_with_bound_branches(self, operation, overwrite, stop_revision,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3500
            _override_hook_source_branch=None):
3501
        """Push from source into target, and into target's master if any.
3502
        """
3503
        def _run_hooks():
3504
            if _override_hook_source_branch:
3505
                result.source_branch = _override_hook_source_branch
3506
            for hook in Branch.hooks['post_push']:
3507
                hook(result)
3508
3509
        bound_location = self.target.get_bound_location()
3510
        if bound_location and self.target.base != bound_location:
3511
            # there is a master branch.
3512
            #
3513
            # XXX: Why the second check?  Is it even supported for a branch to
3514
            # be bound to itself? -- mbp 20070507
3515
            master_branch = self.target.get_master_branch()
3516
            master_branch.lock_write()
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3517
            operation.add_cleanup(master_branch.unlock)
3518
            # push into the master from the source branch.
3519
            master_inter = InterBranch.get(self.source, master_branch)
3520
            master_inter._basic_push(overwrite, stop_revision)
3521
            # and push into the target branch from the source. Note that
3522
            # we push from the source branch again, because it's considered
3523
            # the highest bandwidth repository.
3524
            result = self._basic_push(overwrite, stop_revision)
3525
            result.master_branch = master_branch
3526
            result.local_branch = self.target
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3527
        else:
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3528
            master_branch = None
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3529
            # no master branch
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3530
            result = self._basic_push(overwrite, stop_revision)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3531
            # TODO: Why set master_branch and local_branch if there's no
3532
            # binding?  Maybe cleaner to just leave them unset? -- mbp
3533
            # 20070504
3534
            result.master_branch = self.target
3535
            result.local_branch = None
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3536
        _run_hooks()
3537
        return result
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3538
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3539
    def _pull(self, overwrite=False, stop_revision=None,
3540
             possible_transports=None, _hook_master=None, run_hooks=True,
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3541
             _override_hook_target=None, local=False,
3542
             merge_tags_to_master=True):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3543
        """See Branch.pull.
3544
3545
        This function is the core worker, used by GenericInterBranch.pull to
3546
        avoid duplication when pulling source->master and source->local.
3547
3548
        :param _hook_master: Private parameter - set the branch to
3549
            be supplied as the master to pull hooks.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3550
        :param run_hooks: Private parameter - if false, this branch
3551
            is being called because it's the master of the primary branch,
3552
            so it should not run its hooks.
5662.2.6 by Jelmer Vernooij
add more tests.
3553
            is being called because it's the master of the primary branch,
3554
            so it should not run its hooks.
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3555
        :param _override_hook_target: Private parameter - set the branch to be
3556
            supplied as the target_branch to pull hooks.
3557
        :param local: Only update the local branch, and not the bound branch.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3558
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3559
        # This type of branch can't be bound.
3560
        if local:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3561
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3562
        result = PullResult()
3563
        result.source_branch = self.source
3564
        if _override_hook_target is None:
3565
            result.target_branch = self.target
3566
        else:
3567
            result.target_branch = _override_hook_target
3568
        self.source.lock_read()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3569
        try:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3570
            # We assume that during 'pull' the target repository is closer than
3571
            # the source one.
3572
            self.source.update_references(self.target)
3573
            graph = self.target.repository.get_graph(self.source.repository)
3574
            # TODO: Branch formats should have a flag that indicates 
3575
            # that revno's are expensive, and pull() should honor that flag.
3576
            # -- JRV20090506
3577
            result.old_revno, result.old_revid = \
3578
                self.target.last_revision_info()
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3579
            self._update_revisions(stop_revision, overwrite=overwrite,
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
3580
                graph=graph)
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3581
            # TODO: The old revid should be specified when merging tags, 
3582
            # so a tags implementation that versions tags can only 
3583
            # pull in the most recent changes. -- JRV20090506
6112.4.4 by Jelmer Vernooij
Fix long lines.
3584
            result.tag_updates, result.tag_conflicts = (
3585
                self.source.tags.merge_to(self.target.tags, overwrite,
3586
                    ignore_master=not merge_tags_to_master))
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3587
            result.new_revno, result.new_revid = self.target.last_revision_info()
3588
            if _hook_master:
3589
                result.master_branch = _hook_master
3590
                result.local_branch = result.target_branch
3591
            else:
3592
                result.master_branch = result.target_branch
3593
                result.local_branch = None
3594
            if run_hooks:
3595
                for hook in Branch.hooks['post_pull']:
3596
                    hook(result)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3597
        finally:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3598
            self.source.unlock()
3599
        return result
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3600
3601
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3602
InterBranch.register_optimiser(GenericInterBranch)