/brz/remove-bazaar

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