/brz/remove-bazaar

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