~bzr-pqm/bzr/bzr.dev

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