~bzr-pqm/bzr/bzr.dev

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