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