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