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