/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
1
# Copyright (C) 2005-2012 Canonical Ltd
1553.5.70 by Martin Pool
doc
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1553.5.70 by Martin Pool
doc
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1553.5.70 by Martin Pool
doc
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
17
from __future__ import absolute_import
18
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
19
from . import errors
1 by mbp at sourcefrog
import from baz patch-364
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from .lazy_import import lazy_import
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
22
lazy_import(globals(), """
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
23
import itertools
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
24
from breezy import (
6754.8.12 by Jelmer Vernooij
FIx remaining tests.
25
    cleanup,
6207.3.3 by jelmer at samba
Fix tests and the like.
26
    config as _mod_config,
27
    debug,
28
    fetch,
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
29
    memorytree,
6207.3.3 by jelmer at samba
Fix tests and the like.
30
    repository,
31
    revision as _mod_revision,
32
    tag as _mod_tag,
33
    transport,
34
    ui,
35
    urlutils,
6670.4.3 by Jelmer Vernooij
Fix more imports.
36
    )
37
from breezy.bzr import (
6670.4.15 by Jelmer Vernooij
Fix per workingtree tests.
38
    remote,
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
39
    vf_search,
6207.3.3 by jelmer at samba
Fix tests and the like.
40
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
41
from breezy.i18n import gettext, ngettext
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
42
""")
43
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
44
from . import (
5697.2.1 by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave.
45
    controldir,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
46
    registry,
5697.2.1 by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave.
47
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
48
from .decorators import (
5697.2.1 by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave.
49
    only_raises,
50
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
51
from .hooks import Hooks
52
from .inter import InterObject
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
53
from .lock import LogicalLockResult
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
54
from .sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
55
    BytesIO,
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
56
    viewitems,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
57
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
58
from .trace import mutter, mutter_callsite, note, is_quiet
1104 by Martin Pool
- Add a simple UIFactory
59
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
60
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
61
class UnstackableBranchFormat(errors.BzrError):
62
63
    _fmt = ("The branch '%(url)s'(%(format)s) is not a stackable format. "
64
        "You will need to upgrade the branch to permit branch stacking.")
65
66
    def __init__(self, format, url):
67
        errors.BzrError.__init__(self)
68
        self.format = format
69
        self.url = url
70
71
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
72
class Branch(controldir.ControlComponent):
1 by mbp at sourcefrog
import from baz patch-364
73
    """Branch holding a history of revisions.
74
5158.6.2 by Martin Pool
Branch provides user_url etc
75
    :ivar base:
76
        Base directory/url of the branch; using control_url and
77
        control_transport is more standardized.
5609.25.6 by Andrew Bennetts
Docstring tweaks.
78
    :ivar hooks: An instance of BranchHooks.
79
    :ivar _master_branch_cache: cached result of get_master_branch, see
80
        _clear_cached_state.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
81
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
82
    # this is really an instance variable - FIXME move it there
83
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
84
    base = None
85
5158.6.2 by Martin Pool
Branch provides user_url etc
86
    @property
87
    def control_transport(self):
88
        return self._transport
89
90
    @property
91
    def user_transport(self):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
92
        return self.controldir.user_transport
5158.6.2 by Martin Pool
Branch provides user_url etc
93
6305.3.2 by Jelmer Vernooij
Only make a single connection.
94
    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.
95
        self.tags = self._format.make_tags(self)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
96
        self._revision_history_cache = None
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
97
        self._revision_id_to_revno_cache = None
3949.2.6 by Ian Clatworthy
review feedback from jam
98
        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().
99
        self._partial_revision_history_cache = []
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.
100
        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.
101
        self._master_branch_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
102
        self._merge_sorted_revisions_cache = None
6305.3.2 by Jelmer Vernooij
Only make a single connection.
103
        self._open_hook(possible_transports)
3681.1.1 by Robert Collins
Create a new hook Branch.open. (Robert Collins)
104
        hooks = Branch.hooks['open']
105
        for hook in hooks:
106
            hook(self)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
107
6305.3.2 by Jelmer Vernooij
Only make a single connection.
108
    def _open_hook(self, possible_transports):
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
109
        """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.
110
6305.3.2 by Jelmer Vernooij
Only make a single connection.
111
    def _activate_fallback_location(self, url, possible_transports):
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
112
        """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.
113
        for existing_fallback_repo in self.repository._fallback_repositories:
114
            if existing_fallback_repo.user_url == url:
115
                # This fallback is already configured.  This probably only
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
116
                # happens because ControlDir.sprout is a horrible mess.  To
117
                # avoid 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.
118
                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.
119
                return
6305.3.2 by Jelmer Vernooij
Only make a single connection.
120
        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.
121
        if repo.has_same_location(self.repository):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
122
            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.
123
        self.repository.add_fallback_repository(repo)
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
124
1687.1.8 by Robert Collins
Teach Branch about break_lock.
125
    def break_lock(self):
126
        """Break a lock if one is present from another instance.
127
128
        Uses the ui factory to ask for confirmation if the lock may be from
129
        an active process.
130
131
        This will probe the repository for its lock as well.
132
        """
133
        self.control_files.break_lock()
134
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
135
        master = self.get_master_branch()
136
        if master is not None:
137
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
138
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
139
    def _check_stackable_repo(self):
140
        if not self.repository._format.supports_external_lookups:
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
141
            raise errors.UnstackableRepositoryFormat(
142
                self.repository._format, self.repository.base)
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
143
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().
144
    def _extend_partial_history(self, stop_index=None, stop_revision=None):
145
        """Extend the partial history to include a given index
146
147
        If a stop_index is supplied, stop when that index has been reached.
148
        If a stop_revision is supplied, stop when that revision is
149
        encountered.  Otherwise, stop when the beginning of history is
150
        reached.
151
152
        :param stop_index: The index which should be present.  When it is
153
            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.
154
        :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().
155
            it is encountered, history extension will stop.
156
        """
157
        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.
158
            self._partial_revision_history_cache = [self.last_revision()]
159
        repository._iter_for_revno(
160
            self.repository, self._partial_revision_history_cache,
161
            stop_index=stop_index, stop_revision=stop_revision)
162
        if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
163
            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().
164
4332.3.5 by Robert Collins
Add Branch._get_check_refs.
165
    def _get_check_refs(self):
166
        """Get the references needed for check().
167
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
168
        See breezy.check.
4332.3.5 by Robert Collins
Add Branch._get_check_refs.
169
        """
170
        revid = self.last_revision()
171
        return [('revision-existence', revid), ('lefthand-distance', revid)]
172
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
173
    @staticmethod
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
174
    def open(base, _unsupported=False, possible_transports=None):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
175
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
176
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
177
        For instance, if the branch is at URL/.bzr/branch,
178
        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.
179
        """
6402.3.3 by Jelmer Vernooij
Simplify safe open a bit more.
180
        control = controldir.ControlDir.open(base,
181
            possible_transports=possible_transports, _unsupported=_unsupported)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
182
        return control.open_branch(unsupported=_unsupported,
183
            possible_transports=possible_transports)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
184
185
    @staticmethod
6305.3.2 by Jelmer Vernooij
Only make a single connection.
186
    def open_from_transport(transport, name=None, _unsupported=False,
187
            possible_transports=None):
2485.8.35 by Vincent Ladeuil
Fix pull multiple connections.
188
        """Open the branch rooted at transport"""
6207.3.3 by jelmer at samba
Fix tests and the like.
189
        control = controldir.ControlDir.open_from_transport(transport, _unsupported)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
190
        return control.open_branch(name=name, unsupported=_unsupported,
191
            possible_transports=possible_transports)
2485.8.35 by Vincent Ladeuil
Fix pull multiple connections.
192
193
    @staticmethod
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
194
    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
195
        """Open an existing branch which contains url.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
196
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
197
        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
198
199
        Basically we keep looking up until we find the control directory or
200
        run into the root.  If there isn't one, raises NotBranchError.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
201
        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.
202
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
203
        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.
204
        """
6207.3.3 by jelmer at samba
Fix tests and the like.
205
        control, relpath = controldir.ControlDir.open_containing(url,
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
206
                                                         possible_transports)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
207
        branch = control.open_branch(possible_transports=possible_transports)
208
        return (branch, relpath)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
209
4032.3.5 by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch.
210
    def _push_should_merge_tags(self):
211
        """Should _basic_push merge this branch's tags into the target?
212
213
        The default implementation returns False if this branch has no tags,
214
        and True the rest of the time.  Subclasses may override this.
215
        """
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.
216
        return self.supports_tags() and self.tags.get_tag_dict()
4032.3.5 by Robert Collins
Move BzrBranch._push_should_merge_tags to Branch.
217
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
218
    def get_config(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
219
        """Get a breezy.config.BranchConfig for this Branch.
5284.3.1 by Robert Collins
Document bzrlib.branch.Branch.get_config.
220
221
        This can then be used to get and set configuration options for the
222
        branch.
223
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
224
        :return: A breezy.config.BranchConfig.
5284.3.1 by Robert Collins
Document bzrlib.branch.Branch.get_config.
225
        """
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
226
        return _mod_config.BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
227
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.
228
    def get_config_stack(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
229
        """Get a breezy.config.BranchStack for this Branch.
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.
230
231
        This can then be used to get and set configuration options for the
232
        branch.
233
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
234
        :return: A breezy.config.BranchStack.
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.
235
        """
236
        return _mod_config.BranchStack(self)
237
6538.1.29 by Aaron Bentley
Remove unused 'message'
238
    def store_uncommitted(self, creator):
6538.1.20 by Aaron Bentley
Cleanup
239
        """Store uncommitted changes from a ShelfCreator.
240
6538.1.21 by Aaron Bentley
Ensure shelves are deleted when restored.
241
        :param creator: The ShelfCreator containing uncommitted changes, or
242
            None to delete any stored changes.
6538.1.20 by Aaron Bentley
Cleanup
243
        :raises: ChangesAlreadyStored if the branch already has changes.
244
        """
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
245
        raise NotImplementedError(self.store_uncommitted)
6538.1.4 by Aaron Bentley
Implement store_uncommitted.
246
6538.1.12 by Aaron Bentley
Move unshelver construction to Branch.
247
    def get_unshelver(self, tree):
6538.1.20 by Aaron Bentley
Cleanup
248
        """Return a shelf.Unshelver for this branch and tree.
249
250
        :param tree: The tree to use to construct the Unshelver.
251
        :return: an Unshelver or None if no changes are stored.
252
        """
6538.1.23 by Aaron Bentley
Move uncommitted API to BzrBranch/RemoteBranch.
253
        raise NotImplementedError(self.get_unshelver)
6538.1.8 by Aaron Bentley
Implement branch.get_uncommitted_data.
254
6305.3.2 by Jelmer Vernooij
Only make a single connection.
255
    def _get_fallback_repository(self, url, possible_transports):
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
256
        """Get the repository we fallback to at url."""
257
        url = urlutils.join(self.base, url)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
258
        a_branch = Branch.open(url, possible_transports=possible_transports)
5051.3.14 by Jelmer Vernooij
Remove use of BzrDir.open_branch() without arguments.
259
        return a_branch.repository
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
260
3815.3.4 by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch.
261
    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.
262
        config = self.get_config()
3815.3.4 by Marius Kruger
When doing a `commit --local`, don't try to connect to the master branch.
263
        # explicit overrides master, but don't look for master if local is True
264
        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
265
            try:
266
                master = self.get_master_branch(possible_transports)
5050.7.4 by Parth Malwankar
fixed recursion detection to handle shared repos
267
                if master and self.user_url == master.user_url:
5050.7.5 by Parth Malwankar
better error message for RecursiveBind
268
                    raise errors.RecursiveBind(self.user_url)
3565.6.10 by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable
269
                if master is not None:
270
                    # return the master branch value
3815.3.3 by Marius Kruger
apply Martin's fix for #293440
271
                    return master.nick
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
272
            except errors.RecursiveBind as e:
5050.7.2 by Parth Malwankar
recursive binding now shows a clear error
273
                raise e
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
274
            except errors.BzrError as e:
3565.6.10 by Marius Kruger
Silently fall back to local implicit nick if the master is unavailable
275
                # Silently fall back to local implicit nick if the master is
276
                # unavailable
277
                mutter("Could not connect to bound branch, "
278
                    "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.
279
        return config.get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
280
281
    def _set_nick(self, nick):
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
282
        self.get_config().set_user_option('nickname', nick, warn_masked=True)
1185.35.11 by Aaron Bentley
Added support for branch nicks
283
284
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
285
286
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
287
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
288
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.
289
    def _lefthand_history(self, revision_id, last_rev=None,
290
                          other_branch=None):
291
        if 'evil' in debug.debug_flags:
292
            mutter_callsite(4, "_lefthand_history scales with history.")
293
        # stop_revision must be a descendant of last_revision
294
        graph = self.repository.get_graph()
295
        if last_rev is not None:
296
            if not graph.is_ancestor(last_rev, revision_id):
297
                # our previous tip is not merged into stop_revision
298
                raise errors.DivergedBranches(self, other_branch)
299
        # make a new revision history from the graph
300
        parents_map = graph.get_parent_map([revision_id])
301
        if revision_id not in parents_map:
302
            raise errors.NoSuchRevision(self, revision_id)
303
        current_rev_id = revision_id
304
        new_history = []
305
        check_not_reserved_id = _mod_revision.check_not_reserved_id
306
        # Do not include ghosts or graph origin in revision_history
307
        while (current_rev_id in parents_map and
308
               len(parents_map[current_rev_id]) > 0):
309
            check_not_reserved_id(current_rev_id)
310
            new_history.append(current_rev_id)
311
            current_rev_id = parents_map[current_rev_id][0]
312
            parents_map = graph.get_parent_map([current_rev_id])
313
        new_history.reverse()
314
        return new_history
315
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
316
    def lock_write(self, token=None):
317
        """Lock the branch for write operations.
318
319
        :param token: A token to permit reacquiring a previously held and
320
            preserved lock.
321
        :return: A BranchWriteLockResult.
322
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
323
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
324
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
325
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
326
        """Lock the branch for read operations.
327
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
328
        :return: A breezy.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
329
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
330
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
331
332
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
333
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
334
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
335
    def peek_lock_mode(self):
336
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
337
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
338
1694.2.6 by Martin Pool
[merge] bzr.dev
339
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
340
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
341
3949.2.6 by Ian Clatworthy
review feedback from jam
342
    def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
343
        """Return the revision_id for a dotted revno.
344
345
        :param revno: a tuple like (1,) or (1,1,2)
3949.2.4 by Ian Clatworthy
add top level revno cache
346
        :param _cache_reverse: a private parameter enabling storage
347
           of the reverse mapping in a top level cache. (This should
348
           only be done in selective circumstances as we want to
349
           avoid having the mapping cached multiple times.)
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
350
        :return: the revision_id
351
        :raises errors.NoSuchRevision: if the revno doesn't exist
352
        """
6754.8.6 by Jelmer Vernooij
Remove more decorators.
353
        with self.lock_read():
354
            rev_id = self._do_dotted_revno_to_revision_id(revno)
355
            if _cache_reverse:
356
                self._partial_revision_id_to_revno_cache[rev_id] = revno
357
            return rev_id
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
358
3949.2.6 by Ian Clatworthy
review feedback from jam
359
    def _do_dotted_revno_to_revision_id(self, revno):
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
360
        """Worker function for dotted_revno_to_revision_id.
361
362
        Subclasses should override this if they wish to
363
        provide a more efficient implementation.
364
        """
365
        if len(revno) == 1:
366
            return self.get_rev_id(revno[0])
367
        revision_id_to_revno = self.get_revision_id_to_revno_map()
3949.2.6 by Ian Clatworthy
review feedback from jam
368
        revision_ids = [revision_id for revision_id, this_revno
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
369
                        in viewitems(revision_id_to_revno)
3949.2.6 by Ian Clatworthy
review feedback from jam
370
                        if revno == this_revno]
371
        if len(revision_ids) == 1:
372
            return revision_ids[0]
3949.2.1 by Ian Clatworthy
Branch.dotted_revno_to_revision_id API
373
        else:
374
            revno_str = '.'.join(map(str, revno))
375
            raise errors.NoSuchRevision(self, revno_str)
376
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
377
    def revision_id_to_dotted_revno(self, revision_id):
378
        """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.
379
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
380
        :return: a tuple like (1,) or (400,1,3).
381
        """
6754.8.6 by Jelmer Vernooij
Remove more decorators.
382
        with self.lock_read():
383
            return self._do_revision_id_to_dotted_revno(revision_id)
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
384
3949.2.6 by Ian Clatworthy
review feedback from jam
385
    def _do_revision_id_to_dotted_revno(self, revision_id):
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
386
        """Worker function for revision_id_to_revno."""
3949.2.4 by Ian Clatworthy
add top level revno cache
387
        # Try the caches if they are loaded
3949.2.6 by Ian Clatworthy
review feedback from jam
388
        result = self._partial_revision_id_to_revno_cache.get(revision_id)
389
        if result is not None:
390
            return result
391
        if self._revision_id_to_revno_cache:
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
392
            result = self._revision_id_to_revno_cache.get(revision_id)
3949.2.6 by Ian Clatworthy
review feedback from jam
393
            if result is None:
394
                raise errors.NoSuchRevision(self, revision_id)
395
        # Try the mainline as it's optimised
396
        try:
397
            revno = self.revision_id_to_revno(revision_id)
398
            return (revno,)
399
        except errors.NoSuchRevision:
400
            # We need to load and use the full revno map after all
401
            result = self.get_revision_id_to_revno_map().get(revision_id)
402
            if result is None:
403
                raise errors.NoSuchRevision(self, revision_id)
3949.2.3 by Ian Clatworthy
add Branch.revision_id_to_dotted_revno()
404
        return result
405
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
406
    def get_revision_id_to_revno_map(self):
407
        """Return the revision_id => dotted revno map.
408
409
        This will be regenerated on demand, but will be cached.
410
411
        :return: A dictionary mapping revision_id => dotted revno.
412
            This dictionary should not be modified by the caller.
413
        """
6754.8.5 by Jelmer Vernooij
Avoid decorators.
414
        with self.lock_read():
415
            if self._revision_id_to_revno_cache is not None:
416
                mapping = self._revision_id_to_revno_cache
417
            else:
418
                mapping = self._gen_revno_map()
419
                self._cache_revision_id_to_revno(mapping)
420
            # TODO: jam 20070417 Since this is being cached, should we be returning
421
            #       a copy?
422
            # I would rather not, and instead just declare that users should not
423
            # modify the return value.
424
            return mapping
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
425
426
    def _gen_revno_map(self):
427
        """Create a new mapping from revision ids to dotted revnos.
428
429
        Dotted revnos are generated based on the current tip in the revision
430
        history.
431
        This is the worker function for get_revision_id_to_revno_map, which
432
        just caches the return value.
433
434
        :return: A dictionary mapping revision_id => dotted revno.
435
        """
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
436
        revision_id_to_revno = dict((rev_id, revno)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
437
            for rev_id, depth, revno, end_of_merge
438
             in self.iter_merge_sorted_revisions())
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
439
        return revision_id_to_revno
440
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
441
    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()
442
            stop_revision_id=None, stop_rule='exclude', direction='reverse'):
3949.3.2 by Ian Clatworthy
feedback from jam
443
        """Walk the revisions for a branch in merge sorted order.
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
444
3949.3.8 by Ian Clatworthy
feedback from poolie
445
        Merge sorted order is the output from a merge-aware,
446
        topological sort, i.e. all parents come before their
447
        children going forward; the opposite for reverse.
448
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
449
        :param start_revision_id: the revision_id to begin walking from.
450
            If None, the branch tip is used.
451
        :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()
452
            after. If None, the rest of history is included.
453
        :param stop_rule: if stop_revision_id is not None, the precise rule
454
            to use for termination:
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
455
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
456
            * 'exclude' - leave the stop revision out of the result (default)
457
            * 'include' - the stop revision is the last item in the result
458
            * 'with-merges' - include the stop revision and all of its
459
              merged revisions in the result
5155.1.5 by Vincent Ladeuil
Fixed as per Andrew's review.
460
            * 'with-merges-without-common-ancestry' - filter out revisions 
461
              that are in both ancestries
3949.3.3 by Ian Clatworthy
simplify the meaning of forward to be appropriate to this layer
462
        :param direction: either 'reverse' or 'forward':
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
463
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
464
            * reverse means return the start_revision_id first, i.e.
465
              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
466
            * forward returns tuples in the opposite order to reverse.
467
              Note in particular that forward does *not* do any intelligent
468
              ordering w.r.t. depth as some clients of this API may like.
3949.3.8 by Ian Clatworthy
feedback from poolie
469
              (If required, that ought to be done at higher layers.)
470
471
        :return: an iterator over (revision_id, depth, revno, end_of_merge)
472
            tuples where:
473
474
            * revision_id: the unique id of the revision
475
            * depth: How many levels of merging deep this node has been
476
              found.
477
            * revno_sequence: This field provides a sequence of
478
              revision numbers for all revisions. The format is:
479
              (REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
480
              branch that the revno is on. From left to right the REVNO numbers
481
              are the sequence numbers within that branch of the revision.
482
            * end_of_merge: When True the next node (earlier in history) is
483
              part of a different merge.
3949.3.1 by Ian Clatworthy
introduce Branch.merge_sorted_revisions API
484
        """
6754.8.5 by Jelmer Vernooij
Avoid decorators.
485
        with self.lock_read():
486
            # Note: depth and revno values are in the context of the branch so
487
            # we need the full graph to get stable numbers, regardless of the
488
            # start_revision_id.
489
            if self._merge_sorted_revisions_cache is None:
490
                last_revision = self.last_revision()
491
                known_graph = self.repository.get_known_graph_ancestry(
492
                    [last_revision])
493
                self._merge_sorted_revisions_cache = known_graph.merge_sort(
494
                    last_revision)
495
            filtered = self._filter_merge_sorted_revisions(
496
                self._merge_sorted_revisions_cache, start_revision_id,
497
                stop_revision_id, stop_rule)
498
            # Make sure we don't return revisions that are not part of the
499
            # start_revision_id ancestry.
500
            filtered = self._filter_start_non_ancestors(filtered)
501
            if direction == 'reverse':
502
                return filtered
503
            if direction == 'forward':
504
                return reversed(list(filtered))
505
            else:
506
                raise ValueError('invalid direction %r' % direction)
2418.5.12 by John Arbash Meinel
Move functions from BzrBranch to base Branch object.
507
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
508
    def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
509
        start_revision_id, stop_revision_id, stop_rule):
3949.3.7 by Ian Clatworthy
drop seqnum from in-memory cache
510
        """Iterate over an inclusive range of sorted revisions."""
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
511
        rev_iter = iter(merge_sorted_revisions)
512
        if start_revision_id is not None:
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
513
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
514
                rev_id = node.key
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
515
                if rev_id != start_revision_id:
516
                    continue
517
                else:
3936.3.30 by Ian Clatworthy
use iter_merge_sorted_revisions() with stop_range feature
518
                    # The decision to include the start or not
519
                    # depends on the stop_rule if a stop is provided
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
520
                    # 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.
521
                    rev_iter = itertools.chain(iter([node]), rev_iter)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
522
                    break
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
523
        if stop_revision_id is None:
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
524
            # Yield everything
525
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
526
                rev_id = node.key
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
527
                yield (rev_id, node.merge_depth, node.revno,
528
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
529
        elif stop_rule == 'exclude':
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
530
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
531
                rev_id = node.key
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
532
                if rev_id == stop_revision_id:
533
                    return
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
534
                yield (rev_id, node.merge_depth, node.revno,
535
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
536
        elif stop_rule == 'include':
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
537
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
538
                rev_id = node.key
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
539
                yield (rev_id, node.merge_depth, node.revno,
540
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
541
                if rev_id == stop_revision_id:
542
                    return
5097.1.11 by Vincent Ladeuil
Fix bug #320119 in a crude way.
543
        elif stop_rule == 'with-merges-without-common-ancestry':
544
            # We want to exclude all revisions that are already part of the
545
            # stop_revision_id ancestry.
546
            graph = self.repository.get_graph()
5155.1.3 by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once.
547
            ancestors = graph.find_unique_ancestors(start_revision_id,
548
                                                    [stop_revision_id])
5097.1.11 by Vincent Ladeuil
Fix bug #320119 in a crude way.
549
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
550
                rev_id = node.key
5155.1.3 by Vincent Ladeuil
Fix the performance by finding the relevant subgraph once.
551
                if rev_id not in ancestors:
5097.1.11 by Vincent Ladeuil
Fix bug #320119 in a crude way.
552
                    continue
553
                yield (rev_id, node.merge_depth, node.revno,
554
                       node.end_of_merge)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
555
        elif stop_rule == 'with-merges':
3960.3.4 by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth
556
            stop_rev = self.repository.get_revision(stop_revision_id)
557
            if stop_rev.parent_ids:
4511.3.15 by Marius Kruger
mainline_stop_rev -> left_parent
558
                left_parent = stop_rev.parent_ids[0]
3960.3.4 by Ian Clatworthy
implement with-merges by checking for left-hand parent, not depth
559
            else:
4511.3.15 by Marius Kruger
mainline_stop_rev -> left_parent
560
                left_parent = _mod_revision.NULL_REVISION
561
            # left_parent is the actual revision we want to stop logging at,
562
            # 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.
563
            reached_stop_revision_id = False
4511.3.12 by Marius Kruger
ununinvert logic and improve some variable names.
564
            revision_id_whitelist = []
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
565
            for node in rev_iter:
5988.1.2 by Jelmer Vernooij
Fix log.
566
                rev_id = node.key
4511.3.15 by Marius Kruger
mainline_stop_rev -> left_parent
567
                if rev_id == left_parent:
568
                    # reached the left parent after the stop_revision
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
569
                    return
4511.3.12 by Marius Kruger
ununinvert logic and improve some variable names.
570
                if (not reached_stop_revision_id or
571
                        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.
572
                    yield (rev_id, node.merge_depth, node.revno,
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
573
                       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.
574
                    if reached_stop_revision_id or rev_id == stop_revision_id:
575
                        # only do the merged revs of rev_id from now on
576
                        rev = self.repository.get_revision(rev_id)
577
                        if rev.parent_ids:
578
                            reached_stop_revision_id = True
4511.3.12 by Marius Kruger
ununinvert logic and improve some variable names.
579
                            revision_id_whitelist.extend(rev.parent_ids)
3960.3.1 by Ian Clatworthy
add stop_rule to Branch.iter_merge_sorted_revisions()
580
        else:
581
            raise ValueError('invalid stop_rule %r' % stop_rule)
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
582
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
583
    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
584
        # If we started from a dotted revno, we want to consider it as a tip
585
        # and don't want to yield revisions that are not part of its
586
        # ancestry. Given the order guaranteed by the merge sort, we will see
587
        # uninteresting descendants of the first parent of our tip before the
588
        # tip itself.
6634.2.1 by Martin
Apply 2to3 next fixer and make compatible
589
        first = next(rev_iter)
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
590
        (rev_id, merge_depth, revno, end_of_merge) = first
591
        yield first
592
        if not merge_depth:
593
            # We start at a mainline revision so by definition, all others
594
            # revisions in rev_iter are ancestors
595
            for node in rev_iter:
596
                yield node
597
5097.2.2 by Vincent Ladeuil
Fix performance.
598
        clean = False
5097.2.1 by Vincent Ladeuil
Fix bug #474807 but performance suffers.
599
        whitelist = set()
5097.2.3 by Vincent Ladeuil
Better performance than before the fix.
600
        pmap = self.repository.get_parent_map([rev_id])
601
        parents = pmap.get(rev_id, [])
602
        if parents:
603
            whitelist.update(parents)
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
604
        else:
5097.1.8 by Vincent Ladeuil
Remove the comment about the missing test (it's not worth it at the
605
            # If there is no parents, there is nothing of interest left
606
607
            # FIXME: It's hard to test this scenario here as this code is never
608
            # called in that case. -- vila 20100322
609
            return
610
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
611
        for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
5097.2.2 by Vincent Ladeuil
Fix performance.
612
            if not clean:
613
                if rev_id in whitelist:
5097.2.3 by Vincent Ladeuil
Better performance than before the fix.
614
                    pmap = self.repository.get_parent_map([rev_id])
615
                    parents = pmap.get(rev_id, [])
5097.2.2 by Vincent Ladeuil
Fix performance.
616
                    whitelist.remove(rev_id)
5097.2.3 by Vincent Ladeuil
Better performance than before the fix.
617
                    whitelist.update(parents)
5097.2.2 by Vincent Ladeuil
Fix performance.
618
                    if merge_depth == 0:
619
                        # We've reached the mainline, there is nothing left to
620
                        # filter
621
                        clean = True
622
                else:
623
                    # A revision that is not part of the ancestry of our
624
                    # starting revision.
625
                    continue
5097.1.5 by Vincent Ladeuil
First attempt at fixing the bug, fortunately the bug report exhibits an
626
            yield (rev_id, merge_depth, revno, end_of_merge)
627
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
628
    def leave_lock_in_place(self):
629
        """Tell this branch object not to release the physical lock when this
630
        object is unlocked.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
631
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
632
        If lock_write doesn't return a token, then this method is not supported.
633
        """
634
        self.control_files.leave_in_place()
635
636
    def dont_leave_lock_in_place(self):
637
        """Tell this branch object to release the physical lock when this
638
        object is unlocked, even if it didn't originally acquire it.
639
640
        If lock_write doesn't return a token, then this method is not supported.
641
        """
642
        self.control_files.dont_leave_in_place()
643
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
644
    def bind(self, other):
645
        """Bind the local branch the other branch.
646
647
        :param other: The branch to bind to
648
        :type other: Branch
649
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
650
        raise errors.UpgradeRequired(self.user_url)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
651
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
652
    def get_append_revisions_only(self):
653
        """Whether it is only possible to append revisions to the history.
654
        """
6123.9.14 by Jelmer Vernooij
Fix RemoteBranch.get_append_revisions_only().
655
        if not self._format.supports_set_append_revisions_only():
656
            return False
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
657
        return self.get_config_stack().get('append_revisions_only')
6123.9.11 by Jelmer Vernooij
Make get_append_revisions_only public.
658
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.
659
    def set_append_revisions_only(self, enabled):
660
        if not self._format.supports_set_append_revisions_only():
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
661
            raise errors.UpgradeRequired(self.user_url)
6372.4.1 by Jelmer Vernooij
Convert 'append_revisions_only' over to config stacks.
662
        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.
663
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
664
    def set_reference_info(self, file_id, tree_path, branch_location):
665
        """Set the branch location to use for a tree reference."""
666
        raise errors.UnsupportedOperation(self.set_reference_info, self)
667
668
    def get_reference_info(self, file_id):
669
        """Get the tree_path and branch_location for a tree reference."""
670
        raise errors.UnsupportedOperation(self.get_reference_info, self)
671
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
672
    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.
673
        """Copy revisions from from_branch into this branch.
674
675
        :param from_branch: Where to copy from.
676
        :param last_revision: What revision to stop at (None for at the end
677
                              of the branch.
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
678
        :param limit: Optional rough limit of revisions to fetch
4065.1.1 by Robert Collins
Change the return value of fetch() to None.
679
        :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.
680
        """
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
681
        with self.lock_write():
682
            return InterBranch.get(from_branch, self).fetch(
683
                    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.
684
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
685
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
686
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
687
688
        Older format branches cannot bind, please be sure to use a metadir
689
        branch.
690
        """
691
        return None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
692
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
693
    def get_old_bound_location(self):
694
        """Return the URL of the branch we used to be bound to
695
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
696
        raise errors.UpgradeRequired(self.user_url)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
697
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
698
    def get_commit_builder(self, parents, config_stack=None, timestamp=None,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
699
                           timezone=None, committer=None, revprops=None,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
700
                           revision_id=None, lossy=False):
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
701
        """Obtain a CommitBuilder for this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
702
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
703
        :param parents: Revision ids of the parents of the new revision.
704
        :param config: Optional configuration to use.
705
        :param timestamp: Optional timestamp recorded for commit.
706
        :param timezone: Optional timezone for timestamp.
707
        :param committer: Optional committer to set for commit.
708
        :param revprops: Optional dictionary of revision properties.
709
        :param revision_id: Optional revision id.
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
710
        :param lossy: Whether to discard data that can not be natively
711
            represented, when pushing to a foreign VCS 
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
712
        """
713
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
714
        if config_stack is None:
715
            config_stack = self.get_config_stack()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
716
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
717
        return self.repository.get_commit_builder(self, parents, config_stack,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
718
            timestamp, timezone, committer, revprops, revision_id,
719
            lossy)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
720
2810.2.1 by Martin Pool
merge vincent and cleanup
721
    def get_master_branch(self, possible_transports=None):
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
722
        """Return the branch we are bound to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
723
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
724
        :return: Either a Branch, or None
725
        """
726
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
727
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
728
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
729
        """Get the URL this branch is stacked against.
730
731
        :raises NotStacked: If the branch is not stacked.
732
        :raises UnstackableBranchFormat: If the branch does not support
733
            stacking.
734
        """
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
735
        raise NotImplementedError(self.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
736
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
737
    def set_last_revision_info(self, revno, revision_id):
5718.8.3 by Jelmer Vernooij
More branch restructuring.
738
        """Set the last revision of this branch.
739
740
        The caller is responsible for checking that the revno is correct
741
        for this revision id.
742
743
        It may be possible to set the branch last revision to an id not
744
        present in the repository.  However, branches can also be
745
        configured to check constraints on history, in which case this may not
746
        be permitted.
747
        """
5883.1.1 by Jelmer Vernooij
Fix NotImplementedError contents.
748
        raise NotImplementedError(self.set_last_revision_info)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
749
5718.8.6 by Jelmer Vernooij
Move generate_revision_history.
750
    def generate_revision_history(self, revision_id, last_rev=None,
751
                                  other_branch=None):
5718.8.18 by Jelmer Vernooij
Translate local set_rh calls to remote set_rh calls.
752
        """See Branch.generate_revision_history"""
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
753
        with self.lock_write():
754
            graph = self.repository.get_graph()
755
            (last_revno, last_revid) = self.last_revision_info()
756
            known_revision_ids = [
757
                (last_revid, last_revno),
758
                (_mod_revision.NULL_REVISION, 0),
759
                ]
760
            if last_rev is not None:
761
                if not graph.is_ancestor(last_rev, revision_id):
762
                    # our previous tip is not merged into stop_revision
763
                    raise errors.DivergedBranches(self, other_branch)
764
            revno = graph.find_distance_to_null(revision_id, known_revision_ids)
765
            self.set_last_revision_info(revno, revision_id)
5718.8.6 by Jelmer Vernooij
Move generate_revision_history.
766
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
767
    def set_parent(self, url):
768
        """See Branch.set_parent."""
769
        # TODO: Maybe delete old location files?
770
        # URLs should never be unicode, even on the local fs,
771
        # FIXUP this and get_parent in a future branch format bump:
772
        # read and rewrite the file. RBC 20060125
773
        if url is not None:
774
            if isinstance(url, unicode):
775
                try:
776
                    url = url.encode('ascii')
777
                except UnicodeEncodeError:
6729.6.1 by Jelmer Vernooij
Move urlutils errors.
778
                    raise urlutils.InvalidURL(url,
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
779
                        "Urls must be 7-bit ascii, "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
780
                        "use breezy.urlutils.escape")
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
781
            url = urlutils.relative_url(self.base, url)
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
782
        with self.lock_write():
783
            self._set_parent_location(url)
4288.1.4 by Robert Collins
Remove the explicit set_parent method on RemoteBranch in favour of inheriting from Branch.
784
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
785
    def set_stacked_on_url(self, url):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
786
        """Set the URL this branch is stacked against.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
787
788
        :raises UnstackableBranchFormat: If the branch does not support
789
            stacking.
790
        :raises UnstackableRepositoryFormat: If the repository does not support
791
            stacking.
792
        """
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
793
        if not self._format.supports_stacking():
6734.1.11 by Jelmer Vernooij
Move UnstackableBranchFormat.
794
            raise UnstackableBranchFormat(self._format, self.user_url)
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
795
        with self.lock_write():
796
            # XXX: Changing from one fallback repository to another does not check
797
            # that all the data you need is present in the new fallback.
798
            # Possibly it should.
799
            self._check_stackable_repo()
800
            if not url:
801
                try:
802
                    old_url = self.get_stacked_on_url()
803
                except (errors.NotStacked, UnstackableBranchFormat,
804
                    errors.UnstackableRepositoryFormat):
805
                    return
806
                self._unstack()
807
            else:
808
                self._activate_fallback_location(url,
809
                    possible_transports=[self.controldir.root_transport])
810
            # write this out after the repository is stacked to avoid setting a
811
            # stacked config that doesn't work.
812
            self._set_config_location('stacked_on_location', url)
4226.1.3 by Robert Collins
Lift Branch.set_stacked_on_url up from BzrBranch7.
813
4509.3.9 by Martin Pool
Split out Branch._unstack
814
    def _unstack(self):
815
        """Change a branch to be unstacked, copying data as needed.
5697.2.1 by Jelmer Vernooij
Move weave branch to bzrlib.branch_weave.
816
4509.3.9 by Martin Pool
Split out Branch._unstack
817
        Don't call this directly, use set_stacked_on_url(None).
818
        """
6861.4.1 by Jelmer Vernooij
Make progress bars context managers.
819
        with ui.ui_factory.nested_progress_bar() as pb:
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
820
            pb.update(gettext("Unstacking"))
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
821
            # The basic approach here is to fetch the tip of the branch,
822
            # including all available ghosts, from the existing stacked
823
            # repository into a new repository object without the fallbacks. 
824
            #
825
            # XXX: See <https://launchpad.net/bugs/397286> - this may not be
826
            # correct for CHKMap repostiories
827
            old_repository = self.repository
828
            if len(old_repository._fallback_repositories) != 1:
4509.3.9 by Martin Pool
Split out Branch._unstack
829
                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.
830
                    "of %r (fallbacks: %r)" % (old_repository,
831
                        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.
832
            # Open the new repository object.
833
            # Repositories don't offer an interface to remove fallback
834
            # repositories today; take the conceptually simpler option and just
835
            # reopen it.  We reopen it starting from the URL so that we
836
            # get a separate connection for RemoteRepositories and can
837
            # stream from one of them to the other.  This does mean doing
838
            # separate SSH connection setup, but unstacking is not a
839
            # common operation so it's tolerable.
6207.3.3 by jelmer at samba
Fix tests and the like.
840
            new_bzrdir = controldir.ControlDir.open(
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
841
                self.controldir.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.
842
            new_repository = new_bzrdir.find_repository()
843
            if new_repository._fallback_repositories:
844
                raise AssertionError("didn't expect %r to have "
845
                    "fallback_repositories"
846
                    % (self.repository,))
5325.1.4 by Andrew Bennetts
Improve comments.
847
            # Replace self.repository with the new repository.
848
            # 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.
849
            # lock count) of self.repository to the new repository.
850
            lock_token = old_repository.lock_write().repository_token
851
            self.repository = new_repository
852
            if isinstance(self, remote.RemoteBranch):
5325.1.4 by Andrew Bennetts
Improve comments.
853
                # Remote branches can have a second reference to the old
854
                # 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.
855
                if self._real_branch is not None:
856
                    self._real_branch.repository = new_repository
857
            self.repository.lock_write(token=lock_token)
858
            if lock_token is not None:
859
                old_repository.leave_lock_in_place()
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
860
            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.
861
            if lock_token is not None:
862
                # XXX: self.repository.leave_lock_in_place() before this
863
                # function will not be preserved.  Fortunately that doesn't
5325.1.4 by Andrew Bennetts
Improve comments.
864
                # affect the current default format (2a), and would be a
865
                # 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.
866
                #  - Andrew Bennetts, 2010/06/30
867
                self.repository.dont_leave_lock_in_place()
868
            old_lock_count = 0
869
            while True:
870
                try:
871
                    old_repository.unlock()
872
                except errors.LockNotHeld:
873
                    break
874
                old_lock_count += 1
875
            if old_lock_count == 0:
876
                raise AssertionError(
877
                    'old_repository should have been locked at least once.')
878
            for i in range(old_lock_count-1):
879
                self.repository.lock_write()
880
            # Fetch from the old repository into the new.
6754.8.4 by Jelmer Vernooij
Use new context stuff.
881
            with old_repository.lock_read():
4509.3.16 by Martin Pool
Unstack by fetching from the stacked repository combination, not just the fallback.
882
                # XXX: If you unstack a branch while it has a working tree
883
                # with a pending merge, the pending-merged revisions will no
884
                # longer be present.  You can (probably) revert and remerge.
5651.5.1 by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646)
885
                try:
886
                    tags_to_fetch = set(self.tags.get_reverse_tag_dict())
887
                except errors.TagsNotSupported:
888
                    tags_to_fetch = set()
6341.1.4 by Jelmer Vernooij
Move more functionality to vf_search.
889
                fetch_spec = vf_search.NotInOtherForRevs(self.repository,
5651.5.1 by Andrew Bennetts
Make 'bzr reconfigure --unstacked' fetch tagged revisions too. (#401646)
890
                    old_repository, required_ids=[self.last_revision()],
891
                    if_present_ids=tags_to_fetch, find_ghosts=True).execute()
892
                self.repository.fetch(old_repository, fetch_spec=fetch_spec)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
893
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
894
    def _cache_revision_history(self, rev_history):
895
        """Set the cached revision history to rev_history.
896
897
        The revision_history method will use this cache to avoid regenerating
898
        the revision history.
899
900
        This API is semi-public; it only for use by subclasses, all other code
901
        should consider it to be private.
902
        """
903
        self._revision_history_cache = rev_history
904
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
905
    def _cache_revision_id_to_revno(self, revision_id_to_revno):
906
        """Set the cached revision_id => revno map to revision_id_to_revno.
907
908
        This API is semi-public; it only for use by subclasses, all other code
909
        should consider it to be private.
910
        """
911
        self._revision_id_to_revno_cache = revision_id_to_revno
912
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
913
    def _clear_cached_state(self):
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
914
        """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.
915
916
        This means the next call to revision_history will need to call
917
        _gen_revision_history.
918
6499.2.1 by Vincent Ladeuil
Save branch config options only during the final unlock
919
        This API is semi-public; it is only for use by subclasses, all other
920
        code should consider it to be private.
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
921
        """
922
        self._revision_history_cache = None
2418.5.6 by John Arbash Meinel
Cache the revision_id => revno map as appropriate.
923
        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.
924
        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.
925
        self._master_branch_cache = None
3949.3.4 by Ian Clatworthy
jam feedback: start & stop limits; simple caching
926
        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().
927
        self._partial_revision_history_cache = []
928
        self._partial_revision_id_to_revno_cache = {}
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
929
930
    def _gen_revision_history(self):
931
        """Return sequence of revision hashes on to this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
932
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
933
        Unlike revision_history, this method always regenerates or rereads the
934
        revision history, i.e. it does not cache the result, so repeated calls
935
        may be expensive.
936
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
937
        Concrete subclasses should override this instead of revision_history so
938
        that subclasses do not need to deal with caching logic.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
939
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
940
        This API is semi-public; it only for use by subclasses, all other code
941
        should consider it to be private.
942
        """
943
        raise NotImplementedError(self._gen_revision_history)
944
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
945
    def _revision_history(self):
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
946
        if 'evil' in debug.debug_flags:
947
            mutter_callsite(3, "revision_history scales with history.")
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
948
        if self._revision_history_cache is not None:
2375.1.5 by Andrew Bennetts
Deal with review comments from Robert:
949
            history = self._revision_history_cache
950
        else:
951
            history = self._gen_revision_history()
952
            self._cache_revision_history(history)
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
953
        return list(history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
954
955
    def revno(self):
956
        """Return current revision number for this branch.
957
958
        That is equivalent to the number of revisions committed to
959
        this branch.
960
        """
3066.1.1 by John Arbash Meinel
Make the default Branch.revno() implementation just be a thunk to last_revision_info.
961
        return self.last_revision_info()[0]
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
962
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
963
    def unbind(self):
964
        """Older format branches cannot bind or unbind."""
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
965
        raise errors.UpgradeRequired(self.user_url)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
966
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
967
    def last_revision(self):
3211.2.1 by Robert Collins
* Creating a new branch no longer tries to read the entire revision-history
968
        """Return last revision id, or NULL_REVISION."""
969
        return self.last_revision_info()[1]
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
970
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
971
    def last_revision_info(self):
972
        """Return information about the last revision.
973
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.
974
        :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
975
        """
6754.8.7 by Jelmer Vernooij
Fix syntax errors.
976
        with self.lock_read():
6754.8.5 by Jelmer Vernooij
Avoid decorators.
977
            if self._last_revision_info_cache is None:
978
                self._last_revision_info_cache = self._read_last_revision_info()
979
            return self._last_revision_info_cache
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.
980
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
981
    def _read_last_revision_info(self):
5718.8.3 by Jelmer Vernooij
More branch restructuring.
982
        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
983
5777.7.1 by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags.
984
    def import_last_revision_info_and_tags(self, source, revno, revid,
985
                                           lossy=False):
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
986
        """Set the last revision info, importing from another repo if necessary.
987
988
        This is used by the bound branch code to upload a revision to
989
        the master branch first before updating the tip of the local branch.
990
        Revisions referenced by source's tags are also transferred.
991
5535.3.35 by Andrew Bennetts
Fix deprecation warning from some tests, correct some docstrings.
992
        :param source: Source branch to optionally fetch from
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
993
        :param revno: Revision number of the new tip
994
        :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.
995
        :param lossy: Whether to discard metadata that can not be
996
            natively represented
997
        :return: Tuple with the new revision number and revision id
998
            (should only be different from the arguments when lossy=True)
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
999
        """
1000
        if not self.repository.has_same_location(source.repository):
5741.1.8 by Jelmer Vernooij
Remove fetch_tags argument.
1001
            self.fetch(source, revid)
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1002
        self.set_last_revision_info(revno, revid)
5777.7.1 by Jelmer Vernooij
Add lossy argument to Branch.import_last_revision_info_and_tags.
1003
        return (revno, revid)
5535.3.31 by Andrew Bennetts
Cope with tags that reference missing revisions.
1004
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1005
    def revision_id_to_revno(self, revision_id):
1006
        """Given a revision id, return its revno"""
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
1007
        if _mod_revision.is_null(revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1008
            return 0
6165.4.2 by Jelmer Vernooij
Deprecate revision_history.
1009
        history = self._revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1010
        try:
1011
            return history.index(revision_id) + 1
1012
        except ValueError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1013
            raise errors.NoSuchRevision(self, revision_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1014
1015
    def get_rev_id(self, revno, history=None):
1016
        """Find the revision id of the specified revno."""
6754.8.5 by Jelmer Vernooij
Avoid decorators.
1017
        with self.lock_read():
1018
            if revno == 0:
1019
                return _mod_revision.NULL_REVISION
1020
            last_revno, last_revid = self.last_revision_info()
1021
            if revno == last_revno:
1022
                return last_revid
1023
            if revno <= 0 or revno > last_revno:
1024
                raise errors.NoSuchRevision(self, revno)
1025
            distance_from_last = last_revno - revno
1026
            if len(self._partial_revision_history_cache) <= distance_from_last:
1027
                self._extend_partial_history(distance_from_last)
1028
            return self._partial_revision_history_cache[distance_from_last]
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1029
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1030
    def pull(self, source, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
1031
             possible_transports=None, *args, **kwargs):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1032
        """Mirror source into this branch.
1033
1034
        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.
1035
1036
        :returns: PullResult instance
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1037
        """
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
1038
        return InterBranch.get(source, self).pull(overwrite=overwrite,
1039
            stop_revision=stop_revision,
1040
            possible_transports=possible_transports, *args, **kwargs)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1041
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
1042
    def push(self, target, overwrite=False, stop_revision=None, lossy=False,
1043
            *args, **kwargs):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1044
        """Mirror this branch into target.
1045
1046
        This branch is considered to be 'local', having low latency.
1047
        """
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
1048
        return InterBranch.get(self, target).push(overwrite, stop_revision,
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
1049
            lossy, *args, **kwargs)
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
1050
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1051
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
1052
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1053
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1054
1055
    def get_parent(self):
1056
        """Return the parent location of the branch.
1057
4031.1.1 by Alexander Belchenko
Parent location is not used as default for push.
1058
        This is the default location for pull/missing.  The usual
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1059
        pattern is that the user can override it by specifying a
1060
        location.
1061
        """
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1062
        parent = self._get_parent_location()
1063
        if parent is None:
1064
            return parent
1065
        # This is an old-format absolute path to a local branch
1066
        # turn it into a url
1067
        if parent.startswith('/'):
1068
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1069
        try:
1070
            return urlutils.join(self.base[:-1], parent)
6729.6.1 by Jelmer Vernooij
Move urlutils errors.
1071
        except urlutils.InvalidURLJoin as e:
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
1072
            raise errors.InaccessibleParent(parent, self.user_url)
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
1073
1074
    def _get_parent_location(self):
1075
        raise NotImplementedError(self._get_parent_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1076
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1077
    def _set_config_location(self, name, url, config=None,
1078
                             make_relative=False):
1079
        if config is None:
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
1080
            config = self.get_config_stack()
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1081
        if url is None:
1082
            url = ''
1083
        elif make_relative:
1084
            url = urlutils.relative_url(self.base, url)
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
1085
        config.set(name, url)
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1086
1087
    def _get_config_location(self, name, config=None):
1088
        if config is None:
6379.11.1 by Vincent Ladeuil
Migrate location options to config stacks.
1089
            config = self.get_config_stack()
1090
        location = config.get(name)
6385.1.6 by Vincent Ladeuil
Remove the now useless hack
1091
        if location == '':
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1092
            location = None
1093
        return location
1094
4382.3.1 by Jelmer Vernooij
Add Branch.get_child_submit_format(), so particular Branch implementations
1095
    def get_child_submit_format(self):
1096
        """Return the preferred format of submissions to this branch."""
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
1097
        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
1098
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
1099
    def get_submit_branch(self):
1100
        """Return the submit location of the branch.
1101
1102
        This is the default location for bundle.  The usual
1103
        pattern is that the user can override it by specifying a
1104
        location.
1105
        """
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
1106
        return self.get_config_stack().get('submit_branch')
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
1107
1108
    def set_submit_branch(self, location):
1109
        """Return the submit location of the branch.
1110
1111
        This is the default location for bundle.  The usual
1112
        pattern is that the user can override it by specifying a
1113
        location.
1114
        """
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
1115
        self.get_config_stack().set('submit_branch', location)
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
1116
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1117
    def get_public_branch(self):
1118
        """Return the public location of the branch.
1119
4031.3.1 by Frank Aspell
Fixing various typos
1120
        This is used by merge directives.
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
1121
        """
1122
        return self._get_config_location('public_branch')
1123
1124
    def set_public_branch(self, location):
1125
        """Return the submit location of the branch.
1126
1127
        This is the default location for bundle.  The usual
1128
        pattern is that the user can override it by specifying a
1129
        location.
1130
        """
1131
        self._set_config_location('public_branch', location)
1132
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1133
    def get_push_location(self):
6421.3.1 by Vincent Ladeuil
Migrate more branch options to config stacks.
1134
        """Return None or the location to push this branch to."""
1135
        return self.get_config_stack().get('push_location')
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1136
1137
    def set_push_location(self, location):
1138
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
1139
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1140
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.
1141
    def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1142
        """Run the post_change_branch_tip hooks."""
1143
        hooks = Branch.hooks['post_change_branch_tip']
1144
        if not hooks:
1145
            return
1146
        new_revno, new_revid = self.last_revision_info()
1147
        params = ChangeBranchTipParams(
1148
            self, old_revno, new_revno, old_revid, new_revid)
1149
        for hook in hooks:
1150
            hook(params)
1151
1152
    def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1153
        """Run the pre_change_branch_tip hooks."""
1154
        hooks = Branch.hooks['pre_change_branch_tip']
1155
        if not hooks:
1156
            return
1157
        old_revno, old_revid = self.last_revision_info()
1158
        params = ChangeBranchTipParams(
1159
            self, old_revno, new_revno, old_revid, new_revid)
1160
        for hook in hooks:
4943.1.1 by Robert Collins
Do not fiddle with exceptions in the pre_change_branch_tip hook running code.
1161
            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.
1162
1587.1.10 by Robert Collins
update updates working tree and branch together.
1163
    def update(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1164
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
1165
1166
        :return: None or the last_revision pivoted out during the update.
1167
        """
1168
        return None
1169
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1170
    def check_revno(self, revno):
1171
        """\
1172
        Check whether a revno corresponds to any revision.
1173
        Zero (the NULL revision) is considered valid.
1174
        """
1175
        if revno != 0:
1176
            self.check_real_revno(revno)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1177
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1178
    def check_real_revno(self, revno):
1179
        """\
1180
        Check whether a revno corresponds to a real revision.
1181
        Zero (the NULL revision) is considered invalid
1182
        """
1183
        if revno < 1 or revno > self.revno():
3236.1.2 by Michael Hudson
clean up branch.py imports
1184
            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.
1185
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1186
    def clone(self, to_controldir, revision_id=None, repository_policy=None):
1187
        """Clone this branch into to_controldir preserving all semantic values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1188
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1189
        Most API users will want 'create_clone_on_transport', which creates a
1190
        new bzrdir and branch on the fly.
1191
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.
1192
        revision_id: if not None, the revision history in the new branch will
1193
                     be truncated to end with revision_id.
1194
        """
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1195
        result = to_controldir.create_branch()
6754.8.5 by Jelmer Vernooij
Avoid decorators.
1196
        with self.lock_read(), result.lock_write():
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
1197
            if repository_policy is not None:
1198
                repository_policy.configure_branch(result)
1199
            self.copy_content_into(result, revision_id=revision_id)
1200
        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.
1201
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1202
    def sprout(self, to_controldir, revision_id=None, repository_policy=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.
1203
            repository=None):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1204
        """Create a new line of development from the branch, into to_controldir.
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
1205
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1206
        to_controldir controls the branch format.
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
1207
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.
1208
        revision_id: if not None, the revision history in the new branch will
1209
                     be truncated to end with revision_id.
1210
        """
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.
1211
        if (repository_policy is not None and
1212
            repository_policy.requires_stacking()):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1213
            to_controldir._format.require_stacking(_skip_repo=True)
1214
        result = to_controldir.create_branch(repository=repository)
6754.8.5 by Jelmer Vernooij
Avoid decorators.
1215
        with self.lock_read(), result.lock_write():
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
1216
            if repository_policy is not None:
1217
                repository_policy.configure_branch(result)
1218
            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.
1219
            master_url = self.get_bound_location()
1220
            if master_url is None:
6874.1.2 by Jelmer Vernooij
Consistently use Branch.user_url.
1221
                result.set_parent(self.user_url)
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.
1222
            else:
6015.7.1 by John Arbash Meinel
No need to open the master branch just to get its URL.
1223
                result.set_parent(master_url)
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.
1224
        return result
1225
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
1226
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1227
        """Synchronize last revision and revision history between branches.
1228
1229
        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.
1230
        BzrBranch6, but works for BzrBranch5, as long as the destination's
1231
        repository contains all the lefthand ancestors of the intended
1232
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1233
1234
        :param destination: The branch to copy the history into
1235
        :param revision_id: The revision-id to truncate history at.  May
1236
          be None to copy complete history.
1237
        """
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1238
        source_revno, source_revision_id = self.last_revision_info()
1239
        if revision_id is None:
1240
            revno, revision_id = source_revno, source_revision_id
3650.3.3 by Aaron Bentley
fix sprout
1241
        else:
4266.3.8 by Jelmer Vernooij
Consistently use find_distance_to_null.
1242
            graph = self.repository.get_graph()
4266.3.1 by Jelmer Vernooij
Support cloning of branches with ghosts in the left hand side history.
1243
            try:
4266.3.8 by Jelmer Vernooij
Consistently use find_distance_to_null.
1244
                revno = graph.find_distance_to_null(revision_id, 
1245
                    [(source_revision_id, source_revno)])
1246
            except errors.GhostRevisionsHaveNoRevno:
1247
                # Default to 1, if we can't find anything else
1248
                revno = 1
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1249
        destination.set_last_revision_info(revno, revision_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1250
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.
1251
    def copy_content_into(self, destination, revision_id=None):
1252
        """Copy the content of self into destination.
1253
1254
        revision_id: if not None, the revision history in the new branch will
1255
                     be truncated to end with revision_id.
1256
        """
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
1257
        return InterBranch.get(self, destination).copy_content_into(
1258
            revision_id=revision_id)
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1259
1260
    def update_references(self, target):
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1261
        if not getattr(self._format, 'supports_reference_locations', False):
1262
            return
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1263
        reference_dict = self._get_all_reference_info()
4273.1.9 by Aaron Bentley
Cleanup
1264
        if len(reference_dict) == 0:
1265
            return
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1266
        old_base = self.base
1267
        new_base = target.base
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1268
        target_reference_dict = target._get_all_reference_info()
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
1269
        for file_id, (tree_path, branch_location) in viewitems(reference_dict):
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1270
            branch_location = urlutils.rebase_url(branch_location,
1271
                                                  old_base, new_base)
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1272
            target_reference_dict.setdefault(
1273
                file_id, (tree_path, branch_location))
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1274
        target._set_all_reference_info(target_reference_dict)
1185.66.1 by Aaron Bentley
Merged from mainline
1275
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1276
    def check(self, refs):
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1277
        """Check consistency of the branch.
1278
1279
        In particular this checks that revisions given in the revision-history
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1280
        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
1281
        present in the repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1282
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1283
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1284
4332.3.7 by Robert Collins
Convert Branch.check to take a refs dict as well.
1285
        :param refs: Calculated refs for this branch as specified by
1286
            branch._get_check_refs()
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1287
        :return: A BranchCheckResult.
1288
        """
6754.8.5 by Jelmer Vernooij
Avoid decorators.
1289
        with self.lock_read():
1290
            result = BranchCheckResult(self)
1291
            last_revno, last_revision_id = self.last_revision_info()
1292
            actual_revno = refs[('lefthand-distance', last_revision_id)]
1293
            if actual_revno != last_revno:
1294
                result.errors.append(errors.BzrCheckError(
1295
                    'revno does not match len(mainline) %s != %s' % (
1296
                    last_revno, actual_revno)))
1297
            # TODO: We should probably also check that self.revision_history
1298
            # matches the repository for older branch formats.
1299
            # If looking for the code that cross-checks repository parents against
1300
            # the Graph.iter_lefthand_ancestry output, that is now a repository
1301
            # specific check.
1302
            return result
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1303
6127.1.9 by Jelmer Vernooij
Add lightweight option to _get_checkout_format().
1304
    def _get_checkout_format(self, lightweight=False):
1910.2.39 by Aaron Bentley
Fix checkout bug
1305
        """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.
1306
        Weaves are used if this branch's repository uses weaves.
1910.2.39 by Aaron Bentley
Fix checkout bug
1307
        """
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1308
        format = self.repository.controldir.checkout_metadir()
5582.10.3 by Jelmer Vernooij
Remove custom code for presplitout.
1309
        format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
1310
        return format
1311
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1312
    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.
1313
        stacked_on=None, create_prefix=False, use_existing_dir=False,
1314
        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.
1315
        """Create a clone of this branch and its bzrdir.
1316
1317
        :param to_transport: The transport to clone onto.
1318
        :param revision_id: The revision id to use as tip in the new branch.
1319
            If None the tip is obtained from this branch.
1320
        :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.
1321
        :param create_prefix: Create any missing directories leading up to
1322
            to_transport.
1323
        :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.
1324
        """
4044.1.2 by Robert Collins
Reinstate the TODO comment about bzrdir.clone_on_transport.
1325
        # XXX: Fix the bzrdir API to allow getting the branch back from the
1326
        # clone call. Or something. 20090224 RBC/spiv.
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
1327
        # XXX: Should this perhaps clone colocated branches as well, 
1328
        # 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.
1329
        if revision_id is None:
1330
            revision_id = self.last_revision()
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1331
        dir_to = self.controldir.clone_on_transport(to_transport,
4634.105.1 by Andrew Bennetts
Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory.
1332
            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.
1333
            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.
1334
            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.
1335
        return dir_to.open_branch()
1336
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1337
    def create_checkout(self, to_location, revision_id=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1338
                        lightweight=False, accelerator_tree=None,
1339
                        hardlink=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1340
        """Create a checkout of a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1341
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1342
        :param to_location: The url to produce the checkout at
1343
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
1344
        :param lightweight: If True, produce a lightweight checkout, otherwise,
5891.1.3 by Andrew Bennetts
Move docstring formatting fixes.
1345
            produce a bound branch (heavyweight checkout)
3123.5.17 by Aaron Bentley
Update docs
1346
        :param accelerator_tree: A tree which can be used for retrieving file
1347
            contents more quickly than the revision tree, i.e. a workingtree.
1348
            The revision tree will be used for cases where accelerator_tree's
1349
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1350
        :param hardlink: If true, hard-link files from accelerator_tree,
1351
            where possible.
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1352
        :return: The tree of the created checkout
1353
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
1354
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1355
        t.ensure_base()
6127.1.9 by Jelmer Vernooij
Add lightweight option to _get_checkout_format().
1356
        format = self._get_checkout_format(lightweight=lightweight)
6437.10.3 by Jelmer Vernooij
Allow checkouts into empty target directories.
1357
        try:
1358
            checkout = format.initialize_on_transport(t)
1359
        except errors.AlreadyControlDirError:
1360
            # It's fine if the control directory already exists,
1361
            # as long as there is no existing branch and working tree.
1362
            checkout = controldir.ControlDir.open_from_transport(t)
1363
            try:
1364
                checkout.open_branch()
1365
            except errors.NotBranchError:
1366
                pass
1367
            else:
1368
                raise errors.AlreadyControlDirError(t.base)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1369
            if checkout.control_transport.base == self.controldir.control_transport.base:
6437.17.1 by Jelmer Vernooij
Checkouts of colocated branches are always lightweight.
1370
                # When checking out to the same control directory,
1371
                # always create a lightweight checkout
1372
                lightweight = True
6437.10.3 by Jelmer Vernooij
Allow checkouts into empty target directories.
1373
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1374
        if lightweight:
6437.7.3 by Jelmer Vernooij
Use ControlDir.set_branch_reference.
1375
            from_branch = checkout.set_branch_reference(target_branch=self)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1376
        else:
6437.10.1 by Jelmer Vernooij
Simplify handling of checkouts in bzrlib.branch.Branch.create_checkout.
1377
            policy = checkout.determine_repository_policy()
1378
            repo = policy.acquire_repository()[0]
1379
            checkout_branch = checkout.create_branch()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1380
            checkout_branch.bind(self)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1381
            # 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
1382
            # branch tip correctly, and seed it with history.
1383
            checkout_branch.pull(self, stop_revision=revision_id)
6437.10.1 by Jelmer Vernooij
Simplify handling of checkouts in bzrlib.branch.Branch.create_checkout.
1384
            from_branch = None
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1385
        tree = checkout.create_workingtree(revision_id,
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1386
                                           from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1387
                                           accelerator_tree=accelerator_tree,
1388
                                           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.
1389
        basis_tree = tree.basis_tree()
6754.8.4 by Jelmer Vernooij
Use new context stuff.
1390
        with basis_tree.lock_read():
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.
1391
            for path, file_id in basis_tree.iter_references():
1392
                reference_parent = self.reference_parent(file_id, path)
1393
                reference_parent.create_checkout(tree.abspath(path),
6809.4.1 by Jelmer Vernooij
Swap file_id and path arguments for get_reference_revision and get_nested_tree.
1394
                    basis_tree.get_reference_revision(path, file_id),
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.
1395
                    lightweight)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1396
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1397
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
1398
    def reconcile(self, thorough=True):
1399
        """Make sure the data stored in this branch is consistent."""
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1400
        from breezy.reconcile import BranchReconciler
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
1401
        with self.lock_write():
1402
            reconciler = BranchReconciler(self, thorough=thorough)
1403
            reconciler.reconcile()
1404
            return reconciler
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
1405
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
1406
    def reference_parent(self, file_id, path, possible_transports=None):
2100.3.29 by Aaron Bentley
Get merge working initially
1407
        """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.
1408
2100.3.29 by Aaron Bentley
Get merge working initially
1409
        :param file_id: The file_id of the tree reference
1410
        :param path: The path of the file_id in the tree
1411
        :return: A branch associated with the file_id
1412
        """
1413
        # FIXME should provide multiple branches, based on config
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1414
        return Branch.open(self.controldir.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
1415
                           possible_transports=possible_transports)
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
1416
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
1417
    def supports_tags(self):
1418
        return self._format.supports_tags()
1419
5086.4.7 by Jelmer Vernooij
Put automatic_tag_name on Branch.
1420
    def automatic_tag_name(self, revision_id):
1421
        """Try to automatically find the tag name for a revision.
1422
1423
        :param revision_id: Revision id of the revision.
5086.4.8 by Jelmer Vernooij
Review comments from Ian.
1424
        :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.
1425
        """
1426
        for hook in Branch.hooks['automatic_tag_name']:
1427
            ret = hook(self, revision_id)
1428
            if ret is not None:
1429
                return ret
1430
        return None
1431
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.
1432
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1433
                                         other_branch):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1434
        """Ensure that revision_b is a descendant of revision_a.
1435
1436
        This is a helper function for update_revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1437
3441.5.18 by Andrew Bennetts
Fix some test failures.
1438
        :raises: DivergedBranches if revision_b has diverged from revision_a.
1439
        :returns: True if revision_b is a descendant of revision_a.
1440
        """
1441
        relation = self._revision_relations(revision_a, revision_b, graph)
1442
        if relation == 'b_descends_from_a':
1443
            return True
1444
        elif relation == 'diverged':
1445
            raise errors.DivergedBranches(self, other_branch)
1446
        elif relation == 'a_descends_from_b':
1447
            return False
1448
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1449
            raise AssertionError("invalid relation: %r" % (relation,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1450
1451
    def _revision_relations(self, revision_a, revision_b, graph):
1452
        """Determine the relationship between two revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1453
3441.5.18 by Andrew Bennetts
Fix some test failures.
1454
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1455
        """
1456
        heads = graph.heads([revision_a, revision_b])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1457
        if heads == {revision_b}:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1458
            return 'b_descends_from_a'
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1459
        elif heads == {revision_a, revision_b}:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1460
            # These branches have diverged
1461
            return 'diverged'
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1462
        elif heads == {revision_a}:
3441.5.18 by Andrew Bennetts
Fix some test failures.
1463
            return 'a_descends_from_b'
1464
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1465
            raise AssertionError("invalid heads: %r" % (heads,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1466
5741.1.11 by Jelmer Vernooij
Don't make heads_to_fetch() take a stop_revision.
1467
    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.
1468
        """Return the heads that must and that should be fetched to copy this
1469
        branch into another repo.
1470
1471
        :returns: a 2-tuple of (must_fetch, if_present_fetch).  must_fetch is a
1472
            set of heads that must be fetched.  if_present_fetch is a set of
1473
            heads that must be fetched if present, but no error is necessary if
1474
            they are not present.
1475
        """
6404.1.1 by Vincent Ladeuil
Migrate branch.fetch_tags
1476
        # For bzr native formats must_fetch is just the tip, and
1477
        # if_present_fetch are the tags.
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
1478
        must_fetch = {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.
1479
        if_present_fetch = set()
6404.1.1 by Vincent Ladeuil
Migrate branch.fetch_tags
1480
        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.
1481
            try:
1482
                if_present_fetch = set(self.tags.get_reverse_tag_dict())
1483
            except errors.TagsNotSupported:
1484
                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.
1485
        must_fetch.discard(_mod_revision.NULL_REVISION)
1486
        if_present_fetch.discard(_mod_revision.NULL_REVISION)
1487
        return must_fetch, if_present_fetch
1488
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
1489
    def create_memorytree(self):
1490
        """Create a memory tree for this branch.
1491
6883.8.3 by Jelmer Vernooij
Improve docstring for Branch.create_memorytree.
1492
        :return: An in-memory MutableTree instance
6883.8.1 by Jelmer Vernooij
Add Branch.create_memorytree.
1493
        """
1494
        return memorytree.MemoryTree.create_on_branch(self)
1495
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1496
5669.3.10 by Jelmer Vernooij
Use ControlComponentFormat.
1497
class BranchFormat(controldir.ControlComponentFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1498
    """An encapsulation of the initialization and open routines for a format.
1499
1500
    Formats provide three things:
1501
     * An initialization routine,
6213.1.32 by Jelmer Vernooij
Fix check support status.
1502
     * a format description
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1503
     * an open routine.
1504
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1505
    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
1506
    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
1507
    can be classes themselves with class methods - it simply depends on
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1508
    whether state is needed for a given format or not.
1509
1510
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1511
    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.
1512
    object will be created every time regardless.
1513
    """
1514
2363.5.5 by Aaron Bentley
add info.describe_format
1515
    def __eq__(self, other):
1516
        return self.__class__ is other.__class__
1517
1518
    def __ne__(self, other):
1519
        return not (self == other)
1520
6207.3.3 by jelmer at samba
Fix tests and the like.
1521
    def get_reference(self, controldir, name=None):
1522
        """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.
1523
1524
        format probing must have been completed before calling
1525
        this method - it is assumed that the format of the branch
6207.3.3 by jelmer at samba
Fix tests and the like.
1526
        in controldir is correct.
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1527
6207.3.3 by jelmer at samba
Fix tests and the like.
1528
        :param controldir: The controldir to get the branch data from.
5147.4.6 by Jelmer Vernooij
consistency in names
1529
        :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.
1530
        :return: None if the branch is not a reference branch.
1531
        """
1532
        return None
1533
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1534
    @classmethod
6207.3.3 by jelmer at samba
Fix tests and the like.
1535
    def set_reference(self, controldir, name, to_branch):
1536
        """Set the target reference of the branch in controldir.
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1537
1538
        format probing must have been completed before calling
1539
        this method - it is assumed that the format of the branch
6207.3.3 by jelmer at samba
Fix tests and the like.
1540
        in controldir is correct.
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1541
6207.3.3 by jelmer at samba
Fix tests and the like.
1542
        :param controldir: The controldir to set the branch reference for.
5147.4.6 by Jelmer Vernooij
consistency in names
1543
        :param name: Name of colocated branch to set, None for default
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1544
        :param to_branch: branch that the checkout is to reference
1545
        """
1546
        raise NotImplementedError(self.set_reference)
1547
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1548
    def get_format_description(self):
1549
        """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).
1550
        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
1551
6207.3.3 by jelmer at samba
Fix tests and the like.
1552
    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,
1553
        hooks = Branch.hooks['post_branch_init']
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1554
        if not hooks:
1555
            return
6207.3.3 by jelmer at samba
Fix tests and the like.
1556
        params = BranchInitHookParams(self, controldir, name, branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1557
        for hook in hooks:
1558
            hook(params)
1559
6207.3.3 by jelmer at samba
Fix tests and the like.
1560
    def initialize(self, controldir, name=None, repository=None,
6123.9.12 by Jelmer Vernooij
Add append_revisions_only argument to BranchFormat.initialize.
1561
                   append_revisions_only=None):
6207.3.3 by jelmer at samba
Fix tests and the like.
1562
        """Create a branch of this format in controldir.
1563
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1564
        :param name: Name of the colocated branch to create.
1565
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1566
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1567
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.
1568
    def is_supported(self):
1569
        """Is this format supported?
1570
1571
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1572
        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.
1573
        some other features depending on the reason for not being supported.
1574
        """
1575
        return True
1576
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.
1577
    def make_tags(self, branch):
1578
        """Create a tags object for branch.
1579
1580
        This method is on BranchFormat, because BranchFormats are reflected
1581
        over the wire via network_name(), whereas full Branch instances require
1582
        multiple VFS method calls to operate at all.
1583
1584
        The default implementation returns a disabled-tags instance.
1585
1586
        Note that it is normal for branch to be a RemoteBranch when using tags
1587
        on a RemoteBranch.
1588
        """
6105.1.1 by Jelmer Vernooij
Fix "pydoc bzrlib.branch" by importing modules, not objects, using lazy_import.
1589
        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.
1590
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1591
    def network_name(self):
1592
        """A simple byte string uniquely identifying this format for RPC calls.
1593
1594
        MetaDir branch formats use their disk format string to identify the
1595
        repository over the wire. All in one formats such as bzr < 0.8, and
1596
        foreign formats like svn/git and hg should use some marker which is
1597
        unique and immutable.
1598
        """
1599
        raise NotImplementedError(self.network_name)
1600
6207.3.3 by jelmer at samba
Fix tests and the like.
1601
    def open(self, controldir, name=None, _found=False, ignore_fallbacks=False,
6305.3.2 by Jelmer Vernooij
Only make a single connection.
1602
            found_repository=None, possible_transports=None):
6207.3.3 by jelmer at samba
Fix tests and the like.
1603
        """Return the branch object for controldir.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1604
6207.3.3 by jelmer at samba
Fix tests and the like.
1605
        :param controldir: A ControlDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1606
        :param name: Name of colocated branch to open
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1607
        :param _found: a private parameter, do not use it. It is used to
1608
            indicate if format probing has already be done.
1609
        :param ignore_fallbacks: when set, no fallback branches will be opened
1610
            (if there are any).  Default is to open fallbacks.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1611
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1612
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1613
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.
1614
    def supports_set_append_revisions_only(self):
1615
        """True if this format supports set_append_revisions_only."""
1616
        return False
1617
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1618
    def supports_stacking(self):
1619
        """True if this format records a stacked-on branch."""
1620
        return False
1621
5674.1.1 by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat.
1622
    def supports_leaving_lock(self):
1623
        """True if this format supports leaving locks in place."""
1624
        return False # by default
1625
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1626
    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.
1627
        return self.get_format_description().rstrip()
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1628
2220.2.10 by Martin Pool
(broken) start moving things to branches
1629
    def supports_tags(self):
1630
        """True if this format supports tags stored in the branch"""
1631
        return False  # by default
1632
6123.4.6 by Jelmer Vernooij
Move flags to BranchFormat.
1633
    def tags_are_versioned(self):
1634
        """Whether the tag container for this branch versions tags."""
1635
        return False
1636
1637
    def supports_tags_referencing_ghosts(self):
1638
        """True if tags can reference ghost revisions."""
1639
        return True
1640
6772.3.1 by Jelmer Vernooij
Add supports_store_uncommitted.
1641
    def supports_store_uncommitted(self):
1642
        """True if uncommitted changes can be stored in this branch."""
1643
        return True
1644
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1645
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1646
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1647
    """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
1648
6498.3.4 by Jelmer Vernooij
Remove more .set_revision_history / .revision_history references.
1649
    e.g. ['post_push'] Is the list of items to be called when the
1650
    push function is invoked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1651
    """
1652
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1653
    def __init__(self):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1654
        """Create the default hooks.
1655
1656
        These are all empty initially, because by default nothing should get
1657
        notified.
1658
        """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1659
        Hooks.__init__(self, "breezy.branch", "Branch.hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1660
        self.add_hook('open',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1661
            "Called with the Branch object that has been opened after a "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1662
            "branch is opened.", (1, 8))
1663
        self.add_hook('post_push',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1664
            "Called after a push operation completes. post_push is called "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1665
            "with a breezy.branch.BranchPushResult object and only runs in the "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1666
            "bzr client.", (0, 15))
1667
        self.add_hook('post_pull',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1668
            "Called after a pull operation completes. post_pull is called "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1669
            "with a breezy.branch.PullResult object and only runs in the "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1670
            "bzr client.", (0, 15))
1671
        self.add_hook('pre_commit',
5430.4.2 by Vincent Ladeuil
Fix typo in Branch.pre_commit HookPoint docstring.
1672
            "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.
1673
            "completed. pre_commit is called with (local, master, old_revno, "
1674
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1675
            "). old_revid is NULL_REVISION for the first commit to a branch, "
1676
            "tree_delta is a TreeDelta object describing changes from the "
1677
            "basis revision. hooks MUST NOT modify this delta. "
1678
            " future_tree is an in-memory tree obtained from "
1679
            "CommitBuilder.revision_tree() and hooks MUST NOT modify this "
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
1680
            "tree.", (0, 91))
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1681
        self.add_hook('post_commit',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1682
            "Called in the bzr client after a commit has completed. "
1683
            "post_commit is called with (local, master, old_revno, old_revid, "
1684
            "new_revno, new_revid). old_revid is NULL_REVISION for the first "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1685
            "commit to a branch.", (0, 15))
1686
        self.add_hook('post_uncommit',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1687
            "Called in the bzr client after an uncommit completes. "
1688
            "post_uncommit is called with (local, master, old_revno, "
1689
            "old_revid, new_revno, new_revid) where local is the local branch "
1690
            "or None, master is the target branch, and an empty branch "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1691
            "receives new_revno of 0, new_revid of None.", (0, 15))
1692
        self.add_hook('pre_change_branch_tip',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1693
            "Called in bzr client and server before a change to the tip of a "
1694
            "branch is made. pre_change_branch_tip is called with a "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1695
            "breezy.branch.ChangeBranchTipParams. Note that push, pull, "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1696
            "commit, uncommit will all trigger this hook.", (1, 6))
1697
        self.add_hook('post_change_branch_tip',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1698
            "Called in bzr client and server after a change to the tip of a "
1699
            "branch is made. post_change_branch_tip is called with a "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1700
            "breezy.branch.ChangeBranchTipParams. Note that push, pull, "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1701
            "commit, uncommit will all trigger this hook.", (1, 4))
1702
        self.add_hook('transform_fallback_location',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1703
            "Called when a stacked branch is activating its fallback "
1704
            "locations. transform_fallback_location is called with (branch, "
1705
            "url), and should return a new url. Returning the same url "
1706
            "allows it to be used as-is, returning a different one can be "
1707
            "used to cause the branch to stack on a closer copy of that "
1708
            "fallback_location. Note that the branch cannot have history "
1709
            "accessing methods called on it during this hook because the "
1710
            "fallback locations have not been activated. When there are "
1711
            "multiple hooks installed for transform_fallback_location, "
1712
            "all are called with the url returned from the previous hook."
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1713
            "The order is however undefined.", (1, 9))
1714
        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)
1715
            "Called to determine an automatic tag name for a revision. "
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1716
            "automatic_tag_name is called with (branch, revision_id) and "
1717
            "should return a tag name or None if no tag name could be "
5086.4.9 by Jelmer Vernooij
Update documentation.
1718
            "determined. The first non-None tag name returned will be used.",
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1719
            (2, 2))
1720
        self.add_hook('post_branch_init',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1721
            "Called after new branch initialization completes. "
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1722
            "post_branch_init is called with a "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1723
            "breezy.branch.BranchInitHookParams. "
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1724
            "Note that init, branch and checkout (both heavyweight and "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1725
            "lightweight) will all trigger this hook.", (2, 2))
1726
        self.add_hook('post_switch',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1727
            "Called after a checkout switches branch. "
1728
            "post_switch is called with a "
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
1729
            "breezy.branch.SwitchHookParams.", (2, 2))
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1730
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1731
1732
1733
# install the default hooks into the Branch class.
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1734
Branch.hooks = BranchHooks()
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1735
1736
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1737
class ChangeBranchTipParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1738
    """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()
1739
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1740
    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()
1741
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1742
    :ivar branch: the branch being changed
1743
    :ivar old_revno: revision number before the change
1744
    :ivar new_revno: revision number after the change
1745
    :ivar old_revid: revision id before the change
1746
    :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()
1747
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1748
    The revid fields are strings. The revno fields are integers.
1749
    """
1750
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1751
    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
1752
        """Create a group of ChangeBranchTip parameters.
1753
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1754
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1755
        :param old_revno: Revision number before the change.
1756
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1757
        :param old_revid: Tip revision id before the change.
1758
        :param new_revid: Tip revision id after the change.
1759
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1760
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1761
        self.old_revno = old_revno
1762
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1763
        self.old_revid = old_revid
1764
        self.new_revid = new_revid
1765
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1766
    def __eq__(self, other):
1767
        return self.__dict__ == other.__dict__
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1768
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1769
    def __repr__(self):
1770
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1771
            self.__class__.__name__, self.branch,
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1772
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1773
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1774
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1775
class BranchInitHookParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1776
    """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',
1777
1778
    There are 4 fields that hooks may wish to access:
1779
1780
    :ivar format: the branch format
6207.3.3 by jelmer at samba
Fix tests and the like.
1781
    :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',
1782
    :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.
1783
    :ivar branch: the branch created
1784
1785
    Note that for lightweight checkouts, the bzrdir and format fields refer to
1786
    the checkout, hence they are different from the corresponding fields in
1787
    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',
1788
    """
1789
6207.3.3 by jelmer at samba
Fix tests and the like.
1790
    def __init__(self, format, controldir, name, branch):
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1791
        """Create a group of BranchInitHook parameters.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1792
1793
        :param format: the branch format
6207.3.3 by jelmer at samba
Fix tests and the like.
1794
        :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.
1795
            initialized
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1796
        :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.
1797
        :param branch: the branch created
1798
1799
        Note that for lightweight checkouts, the bzrdir and format fields refer
1800
        to the checkout, hence they are different from the corresponding fields
1801
        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',
1802
        """
1803
        self.format = format
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1804
        self.controldir = controldir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1805
        self.name = name
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1806
        self.branch = branch
1807
1808
    def __eq__(self, other):
1809
        return self.__dict__ == other.__dict__
1810
1811
    def __repr__(self):
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
1812
        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',
1813
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1814
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1815
class SwitchHookParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1816
    """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',
1817
1818
    There are 4 fields that hooks may wish to access:
1819
6207.3.3 by jelmer at samba
Fix tests and the like.
1820
    :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',
1821
    :ivar to_branch: branch that the checkout is to reference
1822
    :ivar force: skip the check for local commits in a heavy checkout
1823
    :ivar revision_id: revision ID to switch to (or None)
1824
    """
1825
1826
    def __init__(self, control_dir, to_branch, force, revision_id):
1827
        """Create a group of SwitchHook parameters.
1828
6207.3.3 by jelmer at samba
Fix tests and the like.
1829
        :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',
1830
        :param to_branch: branch that the checkout is to reference
1831
        :param force: skip the check for local commits in a heavy checkout
1832
        :param revision_id: revision ID to switch to (or None)
1833
        """
1834
        self.control_dir = control_dir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1835
        self.to_branch = to_branch
1836
        self.force = force
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1837
        self.revision_id = revision_id
1838
1839
    def __eq__(self, other):
1840
        return self.__dict__ == other.__dict__
1841
1842
    def __repr__(self):
1843
        return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1844
            self.control_dir, self.to_branch,
1845
            self.revision_id)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1846
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1847
5669.3.9 by Jelmer Vernooij
Consistent naming.
1848
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
1849
    """Branch format registry."""
1850
1851
    def __init__(self, other_registry=None):
1852
        super(BranchFormatRegistry, self).__init__(other_registry)
6653.1.9 by Jelmer Vernooij
Fix set_default.
1853
        self._default_format = None
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1854
        self._default_format_key = None
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1855
1856
    def get_default(self):
6653.1.9 by Jelmer Vernooij
Fix set_default.
1857
        """Return the current default format."""
1858
        if (self._default_format_key is not None and
1859
            self._default_format is None):
1860
            self._default_format = self.get(self._default_format_key)
1861
        return self._default_format
1862
1863
    def set_default(self, format):
1864
        """Set the default format."""
1865
        self._default_format = format
1866
        self._default_format_key = None
1867
1868
    def set_default_key(self, format_string):
1869
        """Set the default format by its format string."""
1870
        self._default_format_key = format_string
1871
        self._default_format = None
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1872
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
1873
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1874
network_format_registry = registry.FormatRegistry()
1875
"""Registry of formats indexed by their network name.
1876
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
1877
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.
1878
referring to formats with smart server operations. See
1879
BranchFormat.network_name() for more detail.
1880
"""
1881
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
1882
format_registry = BranchFormatRegistry(network_format_registry)
1883
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1884
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1885
# formats which have no format string are not discoverable
1886
# and not independently creatable, so are not registered.
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1887
format_registry.register_lazy(
6670.4.1 by Jelmer Vernooij
Update imports.
1888
    "Bazaar-NG branch format 5\n", "breezy.bzr.fullhistory",
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1889
    "BzrBranchFormat5")
1890
format_registry.register_lazy(
1891
    "Bazaar Branch Format 6 (bzr 0.15)\n",
6670.4.1 by Jelmer Vernooij
Update imports.
1892
    "breezy.bzr.branch", "BzrBranchFormat6")
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1893
format_registry.register_lazy(
1894
    "Bazaar Branch Format 7 (needs bzr 1.6)\n",
6670.4.1 by Jelmer Vernooij
Update imports.
1895
    "breezy.bzr.branch", "BzrBranchFormat7")
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1896
format_registry.register_lazy(
1897
    "Bazaar Branch Format 8 (needs bzr 1.15)\n",
6670.4.1 by Jelmer Vernooij
Update imports.
1898
    "breezy.bzr.branch", "BzrBranchFormat8")
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1899
format_registry.register_lazy(
1900
    "Bazaar-NG Branch Reference Format 1\n",
6670.4.1 by Jelmer Vernooij
Update imports.
1901
    "breezy.bzr.branch", "BranchReferenceFormat")
6653.1.1 by Jelmer Vernooij
Split bzr branch code out into breezy.bzrbranch.
1902
1903
format_registry.set_default_key("Bazaar Branch Format 7 (needs bzr 1.6)\n")
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1904
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1905
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1906
class BranchWriteLockResult(LogicalLockResult):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1907
    """The result of write locking a branch.
1908
6754.8.4 by Jelmer Vernooij
Use new context stuff.
1909
    :ivar token: The token obtained from the underlying branch lock, or
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1910
        None.
1911
    :ivar unlock: A callable which will unlock the lock.
1912
    """
1913
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
1914
    def __repr__(self):
6754.8.4 by Jelmer Vernooij
Use new context stuff.
1915
        return "BranchWriteLockResult(%r, %r)" % (self.unlock, self.token)
5200.3.5 by Robert Collins
Add __str__ to the new helper classes.
1916
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1917
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1918
######################################################################
1919
# results of operations
1920
2220.2.37 by Martin Pool
Report conflicting tags from push.
1921
1922
class _Result(object):
1923
1924
    def _show_tag_conficts(self, to_file):
1925
        if not getattr(self, 'tag_conflicts', None):
1926
            return
1927
        to_file.write('Conflicting tags:\n')
1928
        for name, value1, value2 in self.tag_conflicts:
1929
            to_file.write('    %s\n' % (name, ))
1930
1931
1932
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1933
    """Result of a Branch.pull operation.
1934
1935
    :ivar old_revno: Revision number before pull.
1936
    :ivar new_revno: Revision number after pull.
1937
    :ivar old_revid: Tip revision id before pull.
1938
    :ivar new_revid: Tip revision id after pull.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1939
    :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.
1940
    :ivar master_branch: Master branch of the target, or the target if no
1941
        Master
1942
    :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.
1943
    :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.
1944
    :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.
1945
    :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
1946
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1947
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
1948
    def report(self, to_file):
6112.4.3 by Jelmer Vernooij
Fix push tests.
1949
        tag_conflicts = getattr(self, "tag_conflicts", None)
1950
        tag_updates = getattr(self, "tag_updates", None)
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
1951
        if not is_quiet():
6112.4.1 by Jelmer Vernooij
Show how many tags have been updated in bzr pull.
1952
            if self.old_revid != self.new_revid:
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
1953
                to_file.write('Now on revision %d.\n' % self.new_revno)
6112.4.3 by Jelmer Vernooij
Fix push tests.
1954
            if tag_updates:
1955
                to_file.write('%d tag(s) updated.\n' % len(tag_updates))
1956
            if self.old_revid == self.new_revid and not tag_updates:
1957
                if not tag_conflicts:
6112.4.1 by Jelmer Vernooij
Show how many tags have been updated in bzr pull.
1958
                    to_file.write('No revisions or tags to pull.\n')
1959
                else:
1960
                    to_file.write('No revisions to pull.\n')
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
1961
        self._show_tag_conficts(to_file)
1962
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1963
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
1964
class BranchPushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1965
    """Result of a Branch.push operation.
1966
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1967
    :ivar old_revno: Revision number (eg 10) of the target before push.
1968
    :ivar new_revno: Revision number (eg 12) of the target after push.
1969
    :ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
1970
        before the push.
1971
    :ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
1972
        after the push.
1973
    :ivar source_branch: Source branch object that the push was from. This is
1974
        read locked, and generally is a local (and thus low latency) branch.
1975
    :ivar master_branch: If target is a bound branch, the master branch of
1976
        target, or target itself. Always write locked.
1977
    :ivar target_branch: The direct Branch where data is being sent (write
1978
        locked).
1979
    :ivar local_branch: If the target is a bound branch this will be the
1980
        target, otherwise it will be None.
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1981
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1982
2220.2.37 by Martin Pool
Report conflicting tags from push.
1983
    def report(self, to_file):
6112.4.5 by Jelmer Vernooij
Add note about bzr pull / bzr push output inconsistency.
1984
        # TODO: This function gets passed a to_file, but then
1985
        # ignores it and calls note() instead. This is also
1986
        # inconsistent with PullResult(), which writes to stdout.
1987
        # -- JRV20110901, bug #838853
6112.4.3 by Jelmer Vernooij
Fix push tests.
1988
        tag_conflicts = getattr(self, "tag_conflicts", None)
1989
        tag_updates = getattr(self, "tag_updates", None)
6112.4.2 by Jelmer Vernooij
Fix tag tests.
1990
        if not is_quiet():
1991
            if self.old_revid != self.new_revid:
6138.3.1 by Jonathan Riddell
use gettext() in more files
1992
                note(gettext('Pushed up to revision %d.') % self.new_revno)
6112.4.3 by Jelmer Vernooij
Fix push tests.
1993
            if tag_updates:
6143.1.1 by Jonathan Riddell
use ngettext for plurals
1994
                note(ngettext('%d tag updated.', '%d tags updated.', len(tag_updates)) % len(tag_updates))
6112.4.3 by Jelmer Vernooij
Fix push tests.
1995
            if self.old_revid == self.new_revid and not tag_updates:
1996
                if not tag_conflicts:
6138.3.1 by Jonathan Riddell
use gettext() in more files
1997
                    note(gettext('No new revisions or tags to push.'))
6112.4.2 by Jelmer Vernooij
Fix tag tests.
1998
                else:
6138.3.1 by Jonathan Riddell
use gettext() in more files
1999
                    note(gettext('No new revisions to push.'))
2220.2.37 by Martin Pool
Report conflicting tags from push.
2000
        self._show_tag_conficts(to_file)
2001
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2002
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2003
class BranchCheckResult(object):
2004
    """Results of checking branch consistency.
2005
2006
    :see: Branch.check
2007
    """
2008
2009
    def __init__(self, branch):
2010
        self.branch = branch
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
2011
        self.errors = []
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2012
2013
    def report_results(self, verbose):
2014
        """Report the check results via trace.note.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2015
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2016
        :param verbose: Requests more detailed display of what was checked,
2017
            if any.
2018
        """
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
2019
        note(gettext('checked branch {0} format {1}').format(
2020
                                self.branch.user_url, self.branch._format))
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
2021
        for error in self.errors:
6138.3.1 by Jonathan Riddell
use gettext() in more files
2022
            note(gettext('found error:%s'), error)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2023
2024
4000.5.1 by Jelmer Vernooij
Add InterBranch.
2025
class InterBranch(InterObject):
2026
    """This class represents operations taking place between two branches.
2027
2028
    Its instances have methods like pull() and push() and contain
2029
    references to the source and target repositories these operations
2030
    can be carried out on.
2031
    """
2032
2033
    _optimisers = []
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2034
    """The available optimised InterBranch types."""
2035
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
2036
    @classmethod
2037
    def _get_branch_formats_to_test(klass):
2038
        """Return an iterable of format tuples for testing.
2039
        
2040
        :return: An iterable of (from_format, to_format) to use when testing
2041
            this InterBranch class. Each InterBranch class should define this
2042
            method itself.
2043
        """
2044
        raise NotImplementedError(klass._get_branch_formats_to_test)
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2045
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2046
    def pull(self, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2047
             possible_transports=None, local=False):
4000.5.10 by Jelmer Vernooij
Fix comment for InterBranch.pull.
2048
        """Mirror source into target branch.
2049
2050
        The target branch is considered to be 'local', having low latency.
2051
2052
        :returns: PullResult instance
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2053
        """
2054
        raise NotImplementedError(self.pull)
2055
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
2056
    def push(self, overwrite=False, stop_revision=None, lossy=False,
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
2057
             _override_hook_source_branch=None):
2058
        """Mirror the source branch into the target branch.
2059
2060
        The source branch is considered to be 'local', having low latency.
2061
        """
2062
        raise NotImplementedError(self.push)
2063
5358.1.1 by Jelmer Vernooij
Add stub for InterBranch.copy_content_into.
2064
    def copy_content_into(self, revision_id=None):
2065
        """Copy the content of source into target
2066
2067
        revision_id: if not None, the revision history in the new branch will
2068
                     be truncated to end with revision_id.
2069
        """
2070
        raise NotImplementedError(self.copy_content_into)
2071
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
2072
    def fetch(self, stop_revision=None, limit=None):
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
2073
        """Fetch revisions.
2074
2075
        :param stop_revision: Last revision to fetch
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
2076
        :param limit: Optional rough limit of revisions to fetch
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
2077
        """
2078
        raise NotImplementedError(self.fetch)
2079
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2080
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
2081
def _fix_overwrite_type(overwrite):
2082
    if isinstance(overwrite, bool):
2083
        if overwrite:
2084
            return ["history", "tags"]
2085
        else:
2086
            return []
2087
    return overwrite
2088
2089
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2090
class GenericInterBranch(InterBranch):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2091
    """InterBranch implementation that uses public Branch functions."""
2092
2093
    @classmethod
2094
    def is_compatible(klass, source, target):
2095
        # GenericBranch uses the public API, so always compatible
2096
        return True
4000.5.1 by Jelmer Vernooij
Add InterBranch.
2097
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
2098
    @classmethod
2099
    def _get_branch_formats_to_test(klass):
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
2100
        return [(format_registry.get_default(), format_registry.get_default())]
4000.5.3 by Jelmer Vernooij
Add tests for InterBranch.
2101
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2102
    @classmethod
2103
    def unwrap_format(klass, format):
2104
        if isinstance(format, remote.RemoteBranchFormat):
2105
            format._ensure_real()
2106
            return format._custom_format
5050.53.4 by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge.
2107
        return format
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2108
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
2109
    def copy_content_into(self, revision_id=None):
2110
        """Copy the content of source into target
2111
2112
        revision_id: if not None, the revision history in the new branch will
2113
                     be truncated to end with revision_id.
2114
        """
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
2115
        with self.source.lock_read(), self.target.lock_write():
2116
            self.source.update_references(self.target)
2117
            self.source._synchronize_history(self.target, revision_id)
2118
            try:
2119
                parent = self.source.get_parent()
2120
            except errors.InaccessibleParent as e:
2121
                mutter('parent was not accessible to copy: %s', e)
2122
            else:
2123
                if parent:
2124
                    self.target.set_parent(parent)
2125
            if self.source._push_should_merge_tags():
2126
                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
2127
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
2128
    def fetch(self, stop_revision=None, limit=None):
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
2129
        if self.target.base == self.source.base:
2130
            return (0, [])
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
2131
        with self.source.lock_read(), self.target.lock_write():
5741.1.6 by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch.
2132
            fetch_spec_factory = fetch.FetchSpecFactory()
2133
            fetch_spec_factory.source_branch = self.source
2134
            fetch_spec_factory.source_branch_stop_revision_id = stop_revision
2135
            fetch_spec_factory.source_repo = self.source.repository
2136
            fetch_spec_factory.target_repo = self.target.repository
2137
            fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
2138
            fetch_spec_factory.limit = limit
5741.1.6 by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch.
2139
            fetch_spec = fetch_spec_factory.make_fetch_spec()
6754.8.4 by Jelmer Vernooij
Use new context stuff.
2140
            return self.target.repository.fetch(
2141
                    self.source.repository,
2142
                    fetch_spec=fetch_spec)
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
2143
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
2144
    def _update_revisions(self, stop_revision=None, overwrite=False,
5809.2.4 by Jelmer Vernooij
remove unused argument.
2145
            graph=None):
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
2146
        with self.source.lock_read(), self.target.lock_write():
2147
            other_revno, other_last_revision = self.source.last_revision_info()
2148
            stop_revno = None # unknown
2149
            if stop_revision is None:
2150
                stop_revision = other_last_revision
2151
                if _mod_revision.is_null(stop_revision):
2152
                    # if there are no commits, we're done.
2153
                    return
2154
                stop_revno = other_revno
2155
2156
            # what's the current last revision, before we fetch [and change it
2157
            # possibly]
2158
            last_rev = _mod_revision.ensure_null(self.target.last_revision())
2159
            # we fetch here so that we don't process data twice in the common
2160
            # case of having something to pull, and so that the check for
2161
            # already merged can operate on the just fetched graph, which will
2162
            # be cached in memory.
2163
            self.fetch(stop_revision=stop_revision)
2164
            # Check to see if one is an ancestor of the other
2165
            if not overwrite:
2166
                if graph is None:
2167
                    graph = self.target.repository.get_graph()
2168
                if self.target._check_if_descendant_or_diverged(
2169
                        stop_revision, last_rev, graph, self.source):
2170
                    # stop_revision is a descendant of last_rev, but we aren't
2171
                    # overwriting, so we're done.
2172
                    return
2173
            if stop_revno is None:
2174
                if graph is None:
2175
                    graph = self.target.repository.get_graph()
2176
                this_revno, this_last_revision = \
2177
                        self.target.last_revision_info()
2178
                stop_revno = graph.find_distance_to_null(stop_revision,
2179
                                [(other_last_revision, other_revno),
2180
                                 (this_last_revision, this_revno)])
2181
            self.target.set_last_revision_info(stop_revno, stop_revision)
2182
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2183
    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
2184
             possible_transports=None, run_hooks=True,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2185
             _override_hook_target=None, local=False):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2186
        """Pull from source into self, updating my master if any.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2187
2188
        :param run_hooks: Private parameter - if false, this branch
2189
            is being called because it's the master of the primary branch,
2190
            so it should not run its hooks.
2191
        """
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
2192
        with self.target.lock_write():
2193
            bound_location = self.target.get_bound_location()
2194
            if local and not bound_location:
2195
                raise errors.LocalRequiresBoundBranch()
2196
            master_branch = None
2197
            source_is_master = False
2198
            if bound_location:
2199
                # bound_location comes from a config file, some care has to be
2200
                # taken to relate it to source.user_url
2201
                normalized = urlutils.normalize_url(bound_location)
2202
                try:
2203
                    relpath = self.source.user_transport.relpath(normalized)
2204
                    source_is_master = (relpath == '')
2205
                except (errors.PathNotChild, urlutils.InvalidURL):
2206
                    source_is_master = False
2207
            if not local and bound_location and not source_is_master:
2208
                # not pulling from master, so we need to update master.
2209
                master_branch = self.target.get_master_branch(possible_transports)
2210
                master_branch.lock_write()
5609.50.1 by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files
2211
            try:
6754.8.13 by Jelmer Vernooij
Avoid needs_write_lock.
2212
                if master_branch:
2213
                    # pull from source into master.
2214
                    master_branch.pull(self.source, overwrite, stop_revision,
2215
                        run_hooks=False)
2216
                return self._pull(overwrite,
2217
                    stop_revision, _hook_master=master_branch,
2218
                    run_hooks=run_hooks,
2219
                    _override_hook_target=_override_hook_target,
2220
                    merge_tags_to_master=not source_is_master)
2221
            finally:
2222
                if master_branch:
2223
                    master_branch.unlock()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2224
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
2225
    def push(self, overwrite=False, stop_revision=None, lossy=False,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2226
             _override_hook_source_branch=None):
2227
        """See InterBranch.push.
2228
2229
        This is the basic concrete implementation of push()
2230
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
2231
        :param _override_hook_source_branch: If specified, run the hooks
2232
            passing this Branch as the source, rather than self.  This is for
2233
            use of RemoteBranch, where push is delegated to the underlying
2234
            vfs-based Branch.
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2235
        """
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
2236
        if lossy:
2237
            raise errors.LossyPushToSameVCS(self.source, self.target)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2238
        # TODO: Public option to disable running hooks - should be trivial but
2239
        # needs tests.
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
2240
6754.8.12 by Jelmer Vernooij
FIx remaining tests.
2241
        op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
2242
        op.add_cleanup(self.source.lock_read().unlock)
2243
        op.add_cleanup(self.target.lock_write().unlock)
2244
        return op.run(overwrite, stop_revision,
2245
            _override_hook_source_branch=_override_hook_source_branch)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2246
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
2247
    def _basic_push(self, overwrite, stop_revision):
2248
        """Basic implementation of push without bound branches or hooks.
2249
2250
        Must be called with source read locked and target write locked.
2251
        """
2252
        result = BranchPushResult()
2253
        result.source_branch = self.source
2254
        result.target_branch = self.target
2255
        result.old_revno, result.old_revid = self.target.last_revision_info()
2256
        self.source.update_references(self.target)
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
2257
        overwrite = _fix_overwrite_type(overwrite)
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
2258
        if result.old_revid != stop_revision:
2259
            # We assume that during 'push' this repository is closer than
2260
            # the target.
2261
            graph = self.source.repository.get_graph(self.target.repository)
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
2262
            self._update_revisions(stop_revision,
2263
                overwrite=("history" in overwrite),
2264
                graph=graph)
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
2265
        if self.source._push_should_merge_tags():
6112.4.4 by Jelmer Vernooij
Fix long lines.
2266
            result.tag_updates, result.tag_conflicts = (
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
2267
                self.source.tags.merge_to(
2268
                self.target.tags, "tags" in overwrite))
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
2269
        result.new_revno, result.new_revid = self.target.last_revision_info()
2270
        return result
2271
6754.8.12 by Jelmer Vernooij
FIx remaining tests.
2272
    def _push_with_bound_branches(self, operation, overwrite, stop_revision,
2273
            _override_hook_source_branch=None):
2274
        """Push from source into target, and into target's master if any.
2275
        """
2276
        def _run_hooks():
2277
            if _override_hook_source_branch:
2278
                result.source_branch = _override_hook_source_branch
2279
            for hook in Branch.hooks['post_push']:
2280
                hook(result)
2281
2282
        bound_location = self.target.get_bound_location()
2283
        if bound_location and self.target.base != bound_location:
2284
            # there is a master branch.
2285
            #
2286
            # XXX: Why the second check?  Is it even supported for a branch to
2287
            # be bound to itself? -- mbp 20070507
2288
            master_branch = self.target.get_master_branch()
2289
            master_branch.lock_write()
2290
            operation.add_cleanup(master_branch.unlock)
2291
            # push into the master from the source branch.
2292
            master_inter = InterBranch.get(self.source, master_branch)
2293
            master_inter._basic_push(overwrite, stop_revision)
2294
            # and push into the target branch from the source. Note that
2295
            # we push from the source branch again, because it's considered
2296
            # the highest bandwidth repository.
2297
            result = self._basic_push(overwrite, stop_revision)
2298
            result.master_branch = master_branch
2299
            result.local_branch = self.target
2300
        else:
2301
            master_branch = None
2302
            # no master branch
2303
            result = self._basic_push(overwrite, stop_revision)
2304
            # TODO: Why set master_branch and local_branch if there's no
2305
            # binding?  Maybe cleaner to just leave them unset? -- mbp
2306
            # 20070504
2307
            result.master_branch = self.target
2308
            result.local_branch = None
2309
        _run_hooks()
2310
        return result
2311
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2312
    def _pull(self, overwrite=False, stop_revision=None,
2313
             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.
2314
             _override_hook_target=None, local=False,
2315
             merge_tags_to_master=True):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2316
        """See Branch.pull.
2317
2318
        This function is the core worker, used by GenericInterBranch.pull to
2319
        avoid duplication when pulling source->master and source->local.
2320
2321
        :param _hook_master: Private parameter - set the branch to
2322
            be supplied as the master to pull hooks.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2323
        :param run_hooks: Private parameter - if false, this branch
2324
            is being called because it's the master of the primary branch,
2325
            so it should not run its hooks.
5662.2.6 by Jelmer Vernooij
add more tests.
2326
            is being called because it's the master of the primary branch,
2327
            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
2328
        :param _override_hook_target: Private parameter - set the branch to be
2329
            supplied as the target_branch to pull hooks.
2330
        :param local: Only update the local branch, and not the bound branch.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2331
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2332
        # This type of branch can't be bound.
2333
        if local:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2334
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2335
        result = PullResult()
2336
        result.source_branch = self.source
2337
        if _override_hook_target is None:
2338
            result.target_branch = self.target
2339
        else:
2340
            result.target_branch = _override_hook_target
6754.8.4 by Jelmer Vernooij
Use new context stuff.
2341
        with self.source.lock_read():
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2342
            # We assume that during 'pull' the target repository is closer than
2343
            # the source one.
2344
            self.source.update_references(self.target)
2345
            graph = self.target.repository.get_graph(self.source.repository)
2346
            # TODO: Branch formats should have a flag that indicates 
2347
            # that revno's are expensive, and pull() should honor that flag.
2348
            # -- JRV20090506
2349
            result.old_revno, result.old_revid = \
2350
                self.target.last_revision_info()
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
2351
            overwrite = _fix_overwrite_type(overwrite)
2352
            self._update_revisions(stop_revision,
2353
                overwrite=("history" in overwrite),
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
2354
                graph=graph)
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
2355
            # TODO: The old revid should be specified when merging tags, 
2356
            # so a tags implementation that versions tags can only 
2357
            # pull in the most recent changes. -- JRV20090506
6112.4.4 by Jelmer Vernooij
Fix long lines.
2358
            result.tag_updates, result.tag_conflicts = (
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
2359
                self.source.tags.merge_to(self.target.tags,
2360
                    "tags" in overwrite,
6112.4.4 by Jelmer Vernooij
Fix long lines.
2361
                    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
2362
            result.new_revno, result.new_revid = self.target.last_revision_info()
2363
            if _hook_master:
2364
                result.master_branch = _hook_master
2365
                result.local_branch = result.target_branch
2366
            else:
2367
                result.master_branch = result.target_branch
2368
                result.local_branch = None
2369
            if run_hooks:
2370
                for hook in Branch.hooks['post_pull']:
2371
                    hook(result)
6754.8.4 by Jelmer Vernooij
Use new context stuff.
2372
            return result
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2373
2374
4000.5.1 by Jelmer Vernooij
Add InterBranch.
2375
InterBranch.register_optimiser(GenericInterBranch)