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