/brz/remove-bazaar

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