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