/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:
5988.1.2 by Jelmer Vernooij
Fix log.
516
                rev_id = node.key
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:
5988.1.2 by Jelmer Vernooij
Fix log.
528
                rev_id = node.key
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
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:
5988.1.2 by Jelmer Vernooij
Fix log.
533
                rev_id = node.key
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:
5988.1.2 by Jelmer Vernooij
Fix log.
540
                rev_id = node.key
4593.5.34 by John Arbash Meinel
Change the KnownGraph.merge_sort api.
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:
5988.1.2 by Jelmer Vernooij
Fix log.
552
                rev_id = node.key
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:
5988.1.2 by Jelmer Vernooij
Fix log.
568
                rev_id = node.key
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)
6015.7.1 by John Arbash Meinel
No need to open the master branch just to get its URL.
1296
            master_url = self.get_bound_location()
1297
            if master_url is None:
5816.6.13 by A. S. Budden
Set the parent location to the branch to which we were bound if this is a bound branch.
1298
                result.set_parent(self.bzrdir.root_transport.base)
1299
            else:
6015.7.1 by John Arbash Meinel
No need to open the master branch just to get its URL.
1300
                result.set_parent(master_url)
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
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()])
6015.15.1 by John Arbash Meinel
Start working on a config entry for testing whether we should fetch tags or not.
1548
        if_present_fetch = set()
1549
        c = self.get_config()
1550
        include_tags = c.get_user_option_as_bool('branch.fetch_tags',
1551
                                                 default=False)
1552
        if include_tags:
1553
            try:
1554
                if_present_fetch = set(self.tags.get_reverse_tag_dict())
1555
            except errors.TagsNotSupported:
1556
                pass
5672.1.1 by Andrew Bennetts
Refactor some of FetchSpecFactory into new Branch.heads_to_fetch method so that branch implementations like looms can override it.
1557
        must_fetch.discard(_mod_revision.NULL_REVISION)
1558
        if_present_fetch.discard(_mod_revision.NULL_REVISION)
1559
        return must_fetch, if_present_fetch
1560
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1561
5669.3.10 by Jelmer Vernooij
Use ControlComponentFormat.
1562
class BranchFormat(controldir.ControlComponentFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1563
    """An encapsulation of the initialization and open routines for a format.
1564
1565
    Formats provide three things:
1566
     * An initialization routine,
1567
     * a format string,
1568
     * an open routine.
1569
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1570
    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
1571
    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
1572
    can be classes themselves with class methods - it simply depends on
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1573
    whether state is needed for a given format or not.
1574
1575
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1576
    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.
1577
    object will be created every time regardless.
1578
    """
1579
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.
1580
    can_set_append_revisions_only = True
1581
2363.5.5 by Aaron Bentley
add info.describe_format
1582
    def __eq__(self, other):
1583
        return self.__class__ is other.__class__
1584
1585
    def __ne__(self, other):
1586
        return not (self == other)
1587
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1588
    @classmethod
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1589
    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.
1590
        """Return the format for the branch object in a_bzrdir."""
1591
        try:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1592
            transport = a_bzrdir.get_branch_transport(None, name=name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1593
            format_string = transport.get_bytes("format")
5662.2.6 by Jelmer Vernooij
add more tests.
1594
            return format_registry.get(format_string)
3236.1.2 by Michael Hudson
clean up branch.py imports
1595
        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)
1596
            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.
1597
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
1598
            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.
1599
1600
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1601
    @deprecated_method(deprecated_in((2, 4, 0)))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1602
    def get_default_format(klass):
1603
        """Return the current default format."""
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1604
        return format_registry.get_default()
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1605
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1606
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1607
    @deprecated_method(deprecated_in((2, 4, 0)))
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1608
    def get_formats(klass):
1609
        """Get all the known formats.
1610
1611
        Warning: This triggers a load of all lazy registered formats: do not
1612
        use except when that is desireed.
1613
        """
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1614
        return format_registry._get_all()
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1615
5147.4.6 by Jelmer Vernooij
consistency in names
1616
    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.
1617
        """Get the target reference of the branch in a_bzrdir.
1618
1619
        format probing must have been completed before calling
1620
        this method - it is assumed that the format of the branch
1621
        in a_bzrdir is correct.
1622
1623
        :param a_bzrdir: The bzrdir to get the branch data from.
5147.4.6 by Jelmer Vernooij
consistency in names
1624
        :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.
1625
        :return: None if the branch is not a reference branch.
1626
        """
1627
        return None
1628
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1629
    @classmethod
5147.4.6 by Jelmer Vernooij
consistency in names
1630
    def set_reference(self, a_bzrdir, name, to_branch):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1631
        """Set the target reference of the branch in a_bzrdir.
1632
1633
        format probing must have been completed before calling
1634
        this method - it is assumed that the format of the branch
1635
        in a_bzrdir is correct.
1636
1637
        :param a_bzrdir: The bzrdir to set the branch reference for.
5147.4.6 by Jelmer Vernooij
consistency in names
1638
        :param name: Name of colocated branch to set, None for default
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1639
        :param to_branch: branch that the checkout is to reference
1640
        """
1641
        raise NotImplementedError(self.set_reference)
1642
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1643
    def get_format_string(self):
1644
        """Return the ASCII format string that identifies this format."""
1645
        raise NotImplementedError(self.get_format_string)
1646
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1647
    def get_format_description(self):
1648
        """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).
1649
        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
1650
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1651
    def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1652
        hooks = Branch.hooks['post_branch_init']
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1653
        if not hooks:
1654
            return
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1655
        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',
1656
        for hook in hooks:
1657
            hook(params)
1658
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.
1659
    def initialize(self, a_bzrdir, name=None, repository=None):
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1660
        """Create a branch of this format in a_bzrdir.
1661
        
1662
        :param name: Name of the colocated branch to create.
1663
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1664
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1665
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
    def is_supported(self):
1667
        """Is this format supported?
1668
1669
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1670
        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.
1671
        some other features depending on the reason for not being supported.
1672
        """
1673
        return True
1674
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.
1675
    def make_tags(self, branch):
1676
        """Create a tags object for branch.
1677
1678
        This method is on BranchFormat, because BranchFormats are reflected
1679
        over the wire via network_name(), whereas full Branch instances require
1680
        multiple VFS method calls to operate at all.
1681
1682
        The default implementation returns a disabled-tags instance.
1683
1684
        Note that it is normal for branch to be a RemoteBranch when using tags
1685
        on a RemoteBranch.
1686
        """
1687
        return DisabledTags(branch)
1688
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1689
    def network_name(self):
1690
        """A simple byte string uniquely identifying this format for RPC calls.
1691
1692
        MetaDir branch formats use their disk format string to identify the
1693
        repository over the wire. All in one formats such as bzr < 0.8, and
1694
        foreign formats like svn/git and hg should use some marker which is
1695
        unique and immutable.
1696
        """
1697
        raise NotImplementedError(self.network_name)
1698
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.
1699
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
1700
            found_repository=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1701
        """Return the branch object for a_bzrdir
1702
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1703
        :param a_bzrdir: A BzrDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1704
        :param name: Name of colocated branch to open
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1705
        :param _found: a private parameter, do not use it. It is used to
1706
            indicate if format probing has already be done.
1707
        :param ignore_fallbacks: when set, no fallback branches will be opened
1708
            (if there are any).  Default is to open fallbacks.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1709
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1710
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1711
1712
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1713
    @deprecated_method(deprecated_in((2, 4, 0)))
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1714
    def register_format(klass, format):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1715
        """Register a metadir format.
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1716
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1717
        See MetaDirBranchFormatFactory for the ability to register a format
1718
        without loading the code the format needs until it is actually used.
1719
        """
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
1720
        format_registry.register(format)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1721
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.
1722
    @classmethod
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1723
    @deprecated_method(deprecated_in((2, 4, 0)))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1724
    def set_default_format(klass, format):
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
1725
        format_registry.set_default(format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1726
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.
1727
    def supports_set_append_revisions_only(self):
1728
        """True if this format supports set_append_revisions_only."""
1729
        return False
1730
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1731
    def supports_stacking(self):
1732
        """True if this format records a stacked-on branch."""
1733
        return False
1734
5674.1.1 by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat.
1735
    def supports_leaving_lock(self):
1736
        """True if this format supports leaving locks in place."""
1737
        return False # by default
1738
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1739
    @classmethod
5662.2.6 by Jelmer Vernooij
add more tests.
1740
    @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.
1741
    def unregister_format(klass, format):
5662.2.3 by Jelmer Vernooij
Fix tests.
1742
        format_registry.remove(format)
5642.2.1 by Jelmer Vernooij
Allow the registration of non-metadir branch formats.
1743
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1744
    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.
1745
        return self.get_format_description().rstrip()
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1746
2220.2.10 by Martin Pool
(broken) start moving things to branches
1747
    def supports_tags(self):
1748
        """True if this format supports tags stored in the branch"""
1749
        return False  # by default
1750
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1751
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1752
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
1753
    """A factory for a BranchFormat object, permitting simple lazy registration.
1754
    
1755
    While none of the built in BranchFormats are lazy registered yet,
1756
    bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1757
    use it, and the bzr-loom plugin uses it as well (see
1758
    bzrlib.plugins.loom.formats).
1759
    """
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1760
1761
    def __init__(self, format_string, module_name, member_name):
1762
        """Create a MetaDirBranchFormatFactory.
1763
1764
        :param format_string: The format string the format has.
1765
        :param module_name: Module to load the format class from.
1766
        :param member_name: Attribute name within the module for the format class.
1767
        """
1768
        registry._LazyObjectGetter.__init__(self, module_name, member_name)
1769
        self._format_string = format_string
1770
        
1771
    def get_format_string(self):
1772
        """See BranchFormat.get_format_string."""
1773
        return self._format_string
1774
1775
    def __call__(self):
1776
        """Used for network_format_registry support."""
1777
        return self.get_obj()()
1778
1779
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1780
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1781
    """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
1782
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1783
    e.g. ['set_rh'] Is the list of items to be called when the
1784
    set_revision_history function is invoked.
1785
    """
1786
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1787
    def __init__(self):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1788
        """Create the default hooks.
1789
1790
        These are all empty initially, because by default nothing should get
1791
        notified.
1792
        """
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1793
        Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1794
        self.add_hook('set_rh',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1795
            "Invoked whenever the revision history has been set via "
1796
            "set_revision_history. The api signature is (branch, "
1797
            "revision_history), and the branch will be write-locked. "
1798
            "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.
1799
            "hook to use is Branch.post_change_branch_tip.", (0, 15))
1800
        self.add_hook('open',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1801
            "Called with the Branch object that has been opened after a "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1802
            "branch is opened.", (1, 8))
1803
        self.add_hook('post_push',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1804
            "Called after a push operation completes. post_push is called "
4053.3.4 by Jelmer Vernooij
Update branch hooks documentation.
1805
            "with a bzrlib.branch.BranchPushResult object and only runs in the "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1806
            "bzr client.", (0, 15))
1807
        self.add_hook('post_pull',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1808
            "Called after a pull operation completes. post_pull is called "
1809
            "with a bzrlib.branch.PullResult object and only runs in the "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1810
            "bzr client.", (0, 15))
1811
        self.add_hook('pre_commit',
5430.4.2 by Vincent Ladeuil
Fix typo in Branch.pre_commit HookPoint docstring.
1812
            "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.
1813
            "completed. pre_commit is called with (local, master, old_revno, "
1814
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1815
            "). old_revid is NULL_REVISION for the first commit to a branch, "
1816
            "tree_delta is a TreeDelta object describing changes from the "
1817
            "basis revision. hooks MUST NOT modify this delta. "
1818
            " future_tree is an in-memory tree obtained from "
1819
            "CommitBuilder.revision_tree() and hooks MUST NOT modify this "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1820
            "tree.", (0,91))
1821
        self.add_hook('post_commit',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1822
            "Called in the bzr client after a commit has completed. "
1823
            "post_commit is called with (local, master, old_revno, old_revid, "
1824
            "new_revno, new_revid). old_revid is NULL_REVISION for the first "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1825
            "commit to a branch.", (0, 15))
1826
        self.add_hook('post_uncommit',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1827
            "Called in the bzr client after an uncommit completes. "
1828
            "post_uncommit is called with (local, master, old_revno, "
1829
            "old_revid, new_revno, new_revid) where local is the local branch "
1830
            "or None, master is the target branch, and an empty branch "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1831
            "receives new_revno of 0, new_revid of None.", (0, 15))
1832
        self.add_hook('pre_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 before a change to the tip of a "
1834
            "branch is made. pre_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, 6))
1837
        self.add_hook('post_change_branch_tip',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1838
            "Called in bzr client and server after a change to the tip of a "
1839
            "branch is made. post_change_branch_tip is called with a "
1840
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1841
            "commit, uncommit will all trigger this hook.", (1, 4))
1842
        self.add_hook('transform_fallback_location',
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1843
            "Called when a stacked branch is activating its fallback "
1844
            "locations. transform_fallback_location is called with (branch, "
1845
            "url), and should return a new url. Returning the same url "
1846
            "allows it to be used as-is, returning a different one can be "
1847
            "used to cause the branch to stack on a closer copy of that "
1848
            "fallback_location. Note that the branch cannot have history "
1849
            "accessing methods called on it during this hook because the "
1850
            "fallback locations have not been activated. When there are "
1851
            "multiple hooks installed for transform_fallback_location, "
1852
            "all are called with the url returned from the previous hook."
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1853
            "The order is however undefined.", (1, 9))
1854
        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)
1855
            "Called to determine an automatic tag name for a revision. "
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1856
            "automatic_tag_name is called with (branch, revision_id) and "
1857
            "should return a tag name or None if no tag name could be "
5086.4.9 by Jelmer Vernooij
Update documentation.
1858
            "determined. The first non-None tag name returned will be used.",
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1859
            (2, 2))
1860
        self.add_hook('post_branch_init',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1861
            "Called after new branch initialization completes. "
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1862
            "post_branch_init is called with a "
1863
            "bzrlib.branch.BranchInitHookParams. "
1864
            "Note that init, branch and checkout (both heavyweight and "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1865
            "lightweight) will all trigger this hook.", (2, 2))
1866
        self.add_hook('post_switch',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1867
            "Called after a checkout switches branch. "
1868
            "post_switch is called with a "
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
1869
            "bzrlib.branch.SwitchHookParams.", (2, 2))
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1870
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1871
1872
1873
# install the default hooks into the Branch class.
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
1874
Branch.hooks = BranchHooks()
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1875
1876
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1877
class ChangeBranchTipParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1878
    """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()
1879
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1880
    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()
1881
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1882
    :ivar branch: the branch being changed
1883
    :ivar old_revno: revision number before the change
1884
    :ivar new_revno: revision number after the change
1885
    :ivar old_revid: revision id before the change
1886
    :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()
1887
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1888
    The revid fields are strings. The revno fields are integers.
1889
    """
1890
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1891
    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
1892
        """Create a group of ChangeBranchTip parameters.
1893
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1894
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1895
        :param old_revno: Revision number before the change.
1896
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1897
        :param old_revid: Tip revision id before the change.
1898
        :param new_revid: Tip revision id after the change.
1899
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1900
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1901
        self.old_revno = old_revno
1902
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1903
        self.old_revid = old_revid
1904
        self.new_revid = new_revid
1905
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1906
    def __eq__(self, other):
1907
        return self.__dict__ == other.__dict__
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1908
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1909
    def __repr__(self):
1910
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1911
            self.__class__.__name__, self.branch,
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1912
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1913
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1914
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1915
class BranchInitHookParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1916
    """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',
1917
1918
    There are 4 fields that hooks may wish to access:
1919
1920
    :ivar format: the branch format
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1921
    :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',
1922
    :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.
1923
    :ivar branch: the branch created
1924
1925
    Note that for lightweight checkouts, the bzrdir and format fields refer to
1926
    the checkout, hence they are different from the corresponding fields in
1927
    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',
1928
    """
1929
1930
    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,
1931
        """Create a group of BranchInitHook parameters.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1932
1933
        :param format: the branch format
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1934
        :param a_bzrdir: the BzrDir where the branch will be/has been
1935
            initialized
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1936
        :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.
1937
        :param branch: the branch created
1938
1939
        Note that for lightweight checkouts, the bzrdir and format fields refer
1940
        to the checkout, hence they are different from the corresponding fields
1941
        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',
1942
        """
1943
        self.format = format
1944
        self.bzrdir = a_bzrdir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1945
        self.name = name
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1946
        self.branch = branch
1947
1948
    def __eq__(self, other):
1949
        return self.__dict__ == other.__dict__
1950
1951
    def __repr__(self):
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
1952
        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',
1953
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1954
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1955
class SwitchHookParams(object):
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
1956
    """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',
1957
1958
    There are 4 fields that hooks may wish to access:
1959
1960
    :ivar control_dir: BzrDir of the checkout to change
1961
    :ivar to_branch: branch that the checkout is to reference
1962
    :ivar force: skip the check for local commits in a heavy checkout
1963
    :ivar revision_id: revision ID to switch to (or None)
1964
    """
1965
1966
    def __init__(self, control_dir, to_branch, force, revision_id):
1967
        """Create a group of SwitchHook parameters.
1968
1969
        :param control_dir: BzrDir of the checkout to change
1970
        :param to_branch: branch that the checkout is to reference
1971
        :param force: skip the check for local commits in a heavy checkout
1972
        :param revision_id: revision ID to switch to (or None)
1973
        """
1974
        self.control_dir = control_dir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1975
        self.to_branch = to_branch
1976
        self.force = force
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1977
        self.revision_id = revision_id
1978
1979
    def __eq__(self, other):
1980
        return self.__dict__ == other.__dict__
1981
1982
    def __repr__(self):
1983
        return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1984
            self.control_dir, self.to_branch,
1985
            self.revision_id)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1986
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1987
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1988
class BranchFormatMetadir(BranchFormat):
1989
    """Common logic for meta-dir based branch formats."""
1990
1991
    def _branch_class(self):
1992
        """What class to instantiate on open calls."""
1993
        raise NotImplementedError(self._branch_class)
1994
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
1995
    def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1996
                           repository=None):
1997
        """Initialize a branch in a bzrdir, with specified files
1998
1999
        :param a_bzrdir: The bzrdir to initialize the branch in
2000
        :param utf8_files: The files to create as a list of
2001
            (filename, content) tuples
2002
        :param name: Name of colocated branch to create, if any
2003
        :return: a branch in this format
2004
        """
2005
        mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2006
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2007
        control_files = lockable_files.LockableFiles(branch_transport,
2008
            'lock', lockdir.LockDir)
2009
        control_files.create_lock()
2010
        control_files.lock_write()
2011
        try:
2012
            utf8_files += [('format', self.get_format_string())]
2013
            for (filename, content) in utf8_files:
2014
                branch_transport.put_bytes(
2015
                    filename, content,
2016
                    mode=a_bzrdir._get_file_mode())
2017
        finally:
2018
            control_files.unlock()
2019
        branch = self.open(a_bzrdir, name, _found=True,
2020
                found_repository=repository)
2021
        self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2022
        return branch
2023
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2024
    def network_name(self):
2025
        """A simple byte string uniquely identifying this format for RPC calls.
2026
2027
        Metadir branch formats use their format string.
2028
        """
2029
        return self.get_format_string()
2030
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.
2031
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2032
            found_repository=None):
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2033
        """See BranchFormat.open()."""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2034
        if not _found:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2035
            format = BranchFormat.find_format(a_bzrdir, name=name)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2036
            if format.__class__ != self.__class__:
2037
                raise AssertionError("wrong format %r found for %r" %
2038
                    (format, self))
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2039
        transport = a_bzrdir.get_branch_transport(None, name=name)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2040
        try:
2041
            control_files = lockable_files.LockableFiles(transport, 'lock',
2042
                                                         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.
2043
            if found_repository is None:
2044
                found_repository = a_bzrdir.find_repository()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2045
            return self._branch_class()(_format=self,
2046
                              _control_files=control_files,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2047
                              name=name,
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2048
                              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.
2049
                              _repository=found_repository,
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2050
                              ignore_fallbacks=ignore_fallbacks)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2051
        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)
2052
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2053
2054
    def __init__(self):
2055
        super(BranchFormatMetadir, self).__init__()
2056
        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.
2057
        self._matchingbzrdir.set_branch_format(self)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2058
2059
    def supports_tags(self):
2060
        return True
2061
5674.1.1 by Jelmer Vernooij
Add supports_leave_lock flag to BranchFormat and RepositoryFormat.
2062
    def supports_leaving_lock(self):
2063
        return True
2064
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2065
2066
class BzrBranchFormat5(BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2067
    """Bzr branch format 5.
2068
2069
    This format has:
2070
     - a revision-history file.
2071
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2072
     - a lock dir guarding the branch itself
2073
     - 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.
2074
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2075
2076
    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.
2077
    """
2078
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2079
    def _branch_class(self):
2080
        return BzrBranch5
2081
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2082
    def get_format_string(self):
2083
        """See BranchFormat.get_format_string()."""
2084
        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
2085
2086
    def get_format_description(self):
2087
        """See BranchFormat.get_format_description()."""
2088
        return "Branch format 5"
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
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
    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.
2091
        """Create a branch of this format in a_bzrdir."""
2092
        utf8_files = [('revision-history', ''),
2093
                      ('branch-name', ''),
2094
                      ]
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.
2095
        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.
2096
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2097
    def supports_tags(self):
2098
        return False
2099
2100
2101
class BzrBranchFormat6(BranchFormatMetadir):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2102
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2103
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
2104
    Unlike previous formats, this has no explicit revision history. Instead,
2105
    this just stores the last-revision, and the left-hand history leading
2106
    up to there is the history.
2107
2108
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2109
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
2110
    """
2111
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2112
    def _branch_class(self):
2113
        return BzrBranch6
2114
2230.3.1 by Aaron Bentley
Get branch6 creation working
2115
    def get_format_string(self):
2116
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
2117
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
2118
2119
    def get_format_description(self):
2120
        """See BranchFormat.get_format_description()."""
2121
        return "Branch format 6"
2122
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.
2123
    def initialize(self, a_bzrdir, name=None, repository=None):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2124
        """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
2125
        utf8_files = [('last-revision', '0 null:\n'),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
2126
                      ('branch.conf', ''),
2127
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
2128
                      ]
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.
2129
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2130
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.
2131
    def make_tags(self, branch):
2132
        """See bzrlib.branch.BranchFormat.make_tags()."""
2133
        return BasicTags(branch)
2134
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.
2135
    def supports_set_append_revisions_only(self):
2136
        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.
2137
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2138
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2139
class BzrBranchFormat8(BranchFormatMetadir):
2140
    """Metadir format supporting storing locations of subtree branches."""
2141
2142
    def _branch_class(self):
2143
        return BzrBranch8
2144
2145
    def get_format_string(self):
2146
        """See BranchFormat.get_format_string()."""
2147
        return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2148
2149
    def get_format_description(self):
2150
        """See BranchFormat.get_format_description()."""
2151
        return "Branch format 8"
2152
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.
2153
    def initialize(self, a_bzrdir, name=None, repository=None):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2154
        """Create a branch of this format in a_bzrdir."""
2155
        utf8_files = [('last-revision', '0 null:\n'),
2156
                      ('branch.conf', ''),
2157
                      ('tags', ''),
2158
                      ('references', '')
2159
                      ]
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.
2160
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2161
2162
    def make_tags(self, branch):
2163
        """See bzrlib.branch.BranchFormat.make_tags()."""
2164
        return BasicTags(branch)
2165
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.
2166
    def supports_set_append_revisions_only(self):
2167
        return True
2168
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2169
    def supports_stacking(self):
2170
        return True
2171
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
2172
    supports_reference_locations = True
2173
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2174
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2175
class BzrBranchFormat7(BranchFormatMetadir):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2176
    """Branch format with last-revision, tags, and a stacked location pointer.
2177
2178
    The stacked location pointer is passed down to the repository and requires
2179
    a repository format with supports_external_lookups = True.
2180
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
2181
    This format was introduced in bzr 1.6.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2182
    """
2183
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.
2184
    def initialize(self, a_bzrdir, name=None, repository=None):
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2185
        """Create a branch of this format in a_bzrdir."""
2186
        utf8_files = [('last-revision', '0 null:\n'),
2187
                      ('branch.conf', ''),
2188
                      ('tags', ''),
2189
                      ]
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.
2190
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2191
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2192
    def _branch_class(self):
2193
        return BzrBranch7
2194
2195
    def get_format_string(self):
2196
        """See BranchFormat.get_format_string()."""
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
2197
        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2198
2199
    def get_format_description(self):
2200
        """See BranchFormat.get_format_description()."""
2201
        return "Branch format 7"
2202
4301.3.3 by Andrew Bennetts
Move check onto base Branch class, and add a supports_set_append_revisions_only method to BranchFormat, as suggested by Robert.
2203
    def supports_set_append_revisions_only(self):
2204
        return True
2205
5757.1.2 by Jelmer Vernooij
Add separate file for knit pack repository formats.
2206
    def supports_stacking(self):
2207
        return True
2208
5757.1.4 by Jelmer Vernooij
Add bzrlib.repofmt.knitpack_repo to the blacklist in test_import_tariff.
2209
    def make_tags(self, branch):
2210
        """See bzrlib.branch.BranchFormat.make_tags()."""
2211
        return BasicTags(branch)
2212
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
2213
    supports_reference_locations = False
2214
2230.3.1 by Aaron Bentley
Get branch6 creation working
2215
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.
2216
class BranchReferenceFormat(BranchFormat):
2217
    """Bzr branch reference format.
2218
2219
    Branch references are used in implementing checkouts, they
2220
    act as an alias to the real branch which is at some other url.
2221
2222
    This format has:
2223
     - A location file
2224
     - a format string
2225
    """
2226
2227
    def get_format_string(self):
2228
        """See BranchFormat.get_format_string()."""
2229
        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
2230
2231
    def get_format_description(self):
2232
        """See BranchFormat.get_format_description()."""
2233
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2234
5147.4.6 by Jelmer Vernooij
consistency in names
2235
    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.
2236
        """See BranchFormat.get_reference()."""
5147.4.6 by Jelmer Vernooij
consistency in names
2237
        transport = a_bzrdir.get_branch_transport(None, name=name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2238
        return transport.get_bytes('location')
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
2239
5147.4.6 by Jelmer Vernooij
consistency in names
2240
    def set_reference(self, a_bzrdir, name, to_branch):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
2241
        """See BranchFormat.set_reference()."""
5147.4.6 by Jelmer Vernooij
consistency in names
2242
        transport = a_bzrdir.get_branch_transport(None, name=name)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
2243
        location = transport.put_bytes('location', to_branch.base)
2244
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.
2245
    def initialize(self, a_bzrdir, name=None, target_branch=None,
2246
            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.
2247
        """Create a branch of this format in a_bzrdir."""
2248
        if target_branch is None:
2249
            # this format does not implement branch itself, thus the implicit
2250
            # creation contract must see it as uninitializable
2251
            raise errors.UninitializableFormat(self)
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2252
        mutter('creating branch reference in %s', a_bzrdir.user_url)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2253
        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
2254
        branch_transport.put_bytes('location',
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2255
            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
2256
        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',
2257
        branch = self.open(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2258
            a_bzrdir, name, _found=True,
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2259
            possible_transports=[target_branch.bzrdir.root_transport])
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2260
        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',
2261
        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.
2262
2263
    def __init__(self):
2264
        super(BranchReferenceFormat, self).__init__()
2265
        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.
2266
        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.
2267
2268
    def _make_reference_clone_function(format, a_branch):
2269
        """Create a clone() routine for a branch dynamically."""
4050.1.3 by Robert Collins
Add missed new parameter for branch reference cloning.
2270
        def clone(to_bzrdir, revision_id=None,
2271
            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.
2272
            """See Branch.clone()."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2273
            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.
2274
            # cannot obey revision_id limits when cloning a reference ...
2275
            # FIXME RBC 20060210 either nuke revision_id for clone, or
2276
            # emit some sort of warning/error to the caller ?!
2277
        return clone
2278
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2279
    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.
2280
             possible_transports=None, ignore_fallbacks=False,
2281
             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.
2282
        """Return the branch that the branch reference in a_bzrdir points at.
2283
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2284
        :param a_bzrdir: A BzrDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2285
        :param name: Name of colocated branch to open, if any
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2286
        :param _found: a private parameter, do not use it. It is used to
2287
            indicate if format probing has already be done.
2288
        :param ignore_fallbacks: when set, no fallback branches will be opened
2289
            (if there are any).  Default is to open fallbacks.
2290
        :param location: The location of the referenced branch.  If
2291
            unspecified, this will be determined from the branch reference in
2292
            a_bzrdir.
2293
        :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.
2294
        """
2295
        if not _found:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2296
            format = BranchFormat.find_format(a_bzrdir, name=name)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2297
            if format.__class__ != self.__class__:
2298
                raise AssertionError("wrong format %r found for %r" %
2299
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
2300
        if location is None:
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
2301
            location = self.get_reference(a_bzrdir, name)
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2302
        real_bzrdir = bzrdir.BzrDir.open(
2303
            location, possible_transports=possible_transports)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2304
        result = real_bzrdir.open_branch(name=name, 
2305
            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.
2306
        # this changes the behaviour of result.clone to create a new reference
2307
        # rather than a copy of the content of the branch.
2308
        # I did not use a proxy object because that needs much more extensive
2309
        # testing, and we are only changing one behaviour at the moment.
2310
        # If we decide to alter more behaviours - i.e. the implicit nickname
2311
        # then this should be refactored to introduce a tested proxy branch
2312
        # and a subclass of that for use in overriding clone() and ....
2313
        # - RBC 20060210
2314
        result.clone = self._make_reference_clone_function(result)
2315
        return result
2316
2317
5669.3.9 by Jelmer Vernooij
Consistent naming.
2318
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
2319
    """Branch format registry."""
2320
2321
    def __init__(self, other_registry=None):
2322
        super(BranchFormatRegistry, self).__init__(other_registry)
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
2323
        self._default_format = None
2324
2325
    def set_default(self, format):
2326
        self._default_format = format
2327
2328
    def get_default(self):
2329
        return self._default_format
2330
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
2331
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2332
network_format_registry = registry.FormatRegistry()
2333
"""Registry of formats indexed by their network name.
2334
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2335
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.
2336
referring to formats with smart server operations. See
2337
BranchFormat.network_name() for more detail.
2338
"""
2339
5662.2.1 by Jelmer Vernooij
Add BranchFormatRegistry.
2340
format_registry = BranchFormatRegistry(network_format_registry)
2341
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2342
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2343
# formats which have no format string are not discoverable
2344
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
2345
__format5 = BzrBranchFormat5()
2346
__format6 = BzrBranchFormat6()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2347
__format7 = BzrBranchFormat7()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2348
__format8 = BzrBranchFormat8()
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
2349
format_registry.register(__format5)
2350
format_registry.register(BranchReferenceFormat())
2351
format_registry.register(__format6)
2352
format_registry.register(__format7)
2353
format_registry.register(__format8)
2354
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.
2355
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
2356
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2357
class BranchWriteLockResult(LogicalLockResult):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2358
    """The result of write locking a branch.
2359
2360
    :ivar branch_token: The token obtained from the underlying branch lock, or
2361
        None.
2362
    :ivar unlock: A callable which will unlock the lock.
2363
    """
2364
2365
    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.
2366
        LogicalLockResult.__init__(self, unlock)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2367
        self.branch_token = branch_token
2368
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2369
    def __repr__(self):
5200.3.5 by Robert Collins
Add __str__ to the new helper classes.
2370
        return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2371
            self.unlock)
2372
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2373
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2374
class BzrBranch(Branch, _RelockDebugMixin):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
2375
    """A branch stored in the actual filesystem.
2376
2377
    Note that it's "local" in the context of the filesystem; it doesn't
2378
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
2379
    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
2380
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2381
    :ivar _transport: Transport for file operations on this branch's
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2382
        control files, typically pointing to the .bzr/branch directory.
2383
    :ivar repository: Repository for this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2384
    :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
2385
        containing the .bzr directory.
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2386
    :ivar name: Optional colocated branch name as it exists in the control
2387
        directory.
1 by mbp at sourcefrog
import from baz patch-364
2388
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2389
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
2390
    def __init__(self, _format=None,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2391
                 _control_files=None, a_bzrdir=None, name=None,
2392
                 _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)
2393
        """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.
2394
        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)
2395
            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.
2396
        else:
2397
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2398
        self._base = self.bzrdir.transport.clone('..').base
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2399
        self.name = name
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2400
        # XXX: We should be able to just do
2401
        #   self.base = self.bzrdir.root_transport.base
2402
        # but this does not quite work yet -- mbp 20080522
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2403
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
2404
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2405
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
2406
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2407
        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.
2408
        self.repository = _repository
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2409
        Branch.__init__(self)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
2410
1 by mbp at sourcefrog
import from baz patch-364
2411
    def __str__(self):
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2412
        if self.name is None:
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2413
            return '%s(%s)' % (self.__class__.__name__, self.user_url)
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2414
        else:
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2415
            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2416
                self.name)
1 by mbp at sourcefrog
import from baz patch-364
2417
2418
    __repr__ = __str__
2419
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2420
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2421
        """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
2422
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2423
1442.1.5 by Robert Collins
Give branch.base a docstring.
2424
    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,
2425
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2426
    def _get_config(self):
2427
        return TransportConfig(self._transport, 'branch.conf')
2428
1694.2.6 by Martin Pool
[merge] bzr.dev
2429
    def is_locked(self):
2430
        return self.control_files.is_locked()
2431
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).
2432
    def lock_write(self, token=None):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2433
        """Lock the branch for write operations.
2434
2435
        :param token: A token to permit reacquiring a previously held and
2436
            preserved lock.
2437
        :return: A BranchWriteLockResult.
2438
        """
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2439
        if not self.is_locked():
2440
            self._note_lock('w')
4288.1.12 by Robert Collins
Review feedback.
2441
        # 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.
2442
        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).
2443
        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
2444
            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.
2445
            self.repository.lock_write()
2446
            took_lock = True
2447
        else:
2448
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2449
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2450
            return BranchWriteLockResult(self.unlock,
2451
                self.control_files.lock_write(token=token))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2452
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2453
            if took_lock:
2454
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2455
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2456
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
2457
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2458
        """Lock the branch for read operations.
2459
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2460
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2461
        """
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2462
        if not self.is_locked():
2463
            self._note_lock('r')
4288.1.12 by Robert Collins
Review feedback.
2464
        # 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.
2465
        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).
2466
        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
2467
            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.
2468
            self.repository.lock_read()
2469
            took_lock = True
2470
        else:
2471
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2472
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
2473
            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.
2474
            return LogicalLockResult(self.unlock)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2475
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2476
            if took_lock:
2477
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2478
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2479
4634.85.11 by Andrew Bennetts
Suppress most errors from Branch.unlock too.
2480
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2481
    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).
2482
        try:
2483
            self.control_files.unlock()
2484
        finally:
4288.1.12 by Robert Collins
Review feedback.
2485
            # 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).
2486
            repo_control = getattr(self.repository, 'control_files', None)
2487
            if (self.control_files == repo_control or
2488
                not self.control_files.is_locked()):
2489
                self.repository.unlock()
2490
            if not self.control_files.is_locked():
2491
                # we just released the lock
2492
                self._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2493
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
2494
    def peek_lock_mode(self):
2495
        if self.control_files._lock_count == 0:
2496
            return None
2497
        else:
2498
            return self.control_files._lock_mode
2499
1694.2.6 by Martin Pool
[merge] bzr.dev
2500
    def get_physical_lock_status(self):
2501
        return self.control_files.get_physical_lock_status()
2502
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
2503
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2504
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2505
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2506
        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.
2507
5718.7.15 by Jelmer Vernooij
Decorate _set_revision_history rather than set_revision_history.
2508
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2509
    def set_last_revision_info(self, revno, revision_id):
5718.8.12 by Jelmer Vernooij
Fix raising of InvalidRevisionId.
2510
        if not revision_id or not isinstance(revision_id, basestring):
2511
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
5718.8.3 by Jelmer Vernooij
More branch restructuring.
2512
        revision_id = _mod_revision.ensure_null(revision_id)
2513
        old_revno, old_revid = self.last_revision_info()
2514
        if self._get_append_revisions_only():
2515
            self._check_history_violation(revision_id)
2516
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2517
        self._write_last_revision_info(revno, revision_id)
2518
        self._clear_cached_state()
2519
        self._last_revision_info_cache = revno, revision_id
2520
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.4.1 by Aaron Bentley
Get log as fast branch5
2521
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2522
    def basis_tree(self):
2523
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2524
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2525
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2526
    def _get_parent_location(self):
2527
        _locs = ['parent', 'pull', 'x-pull']
2528
        for l in _locs:
2529
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2530
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
2531
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2532
                pass
2533
        return None
2534
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2535
    def get_stacked_on_url(self):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2536
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2537
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2538
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2539
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
2540
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
2541
            'push_location', location,
2542
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2543
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2544
    def _set_parent_location(self, url):
2545
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2546
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2547
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2548
            self._transport.put_bytes('parent', url + '\n',
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2549
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
2550
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2551
    @needs_write_lock
2552
    def unbind(self):
2553
        """If bound, unbind"""
2554
        return self.set_bound_location(None)
2555
2556
    @needs_write_lock
2557
    def bind(self, other):
2558
        """Bind this branch to the branch other.
2559
2560
        This does not push or pull data between the branches, though it does
2561
        check for divergence to raise an error when the branches are not
2562
        either the same, or one a prefix of the other. That behaviour may not
2563
        be useful, so that check may be removed in future.
2564
2565
        :param other: The branch to bind to
2566
        :type other: Branch
2567
        """
2568
        # TODO: jam 20051230 Consider checking if the target is bound
2569
        #       It is debatable whether you should be able to bind to
2570
        #       a branch which is itself bound.
2571
        #       Committing is obviously forbidden,
2572
        #       but binding itself may not be.
2573
        #       Since we *have* to check at commit time, we don't
2574
        #       *need* to check here
2575
2576
        # we want to raise diverged if:
2577
        # last_rev is not in the other_last_rev history, AND
2578
        # other_last_rev is not in our history, and do it without pulling
2579
        # history around
2580
        self.set_bound_location(other.base)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2581
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2582
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2583
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
2584
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2585
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2586
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2587
2588
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2589
    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
2590
        """Return the branch we are bound to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2591
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2592
        :return: Either a Branch, or None
2593
        """
5609.25.3 by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock.
2594
        if self._master_branch_cache is None:
2595
            self._master_branch_cache = self._get_master_branch(
2596
                possible_transports)
2597
        return self._master_branch_cache
2598
2599
    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
2600
        bound_loc = self.get_bound_location()
2601
        if not bound_loc:
2602
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2603
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2604
            return Branch.open(bound_loc,
2605
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2606
        except (errors.NotBranchError, errors.ConnectionError), e:
2607
            raise errors.BoundBranchConnectionFailure(
2608
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2609
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
2610
    @needs_write_lock
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2611
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
2612
        """Set the target where this branch is bound to.
2613
2614
        :param location: URL to the target branch
2615
        """
5609.25.3 by Andrew Bennetts
Alternative fix: cache the result of get_master_branch for the lifetime of the branch lock.
2616
        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.
2617
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2618
            self._transport.put_bytes('bound', location+'\n',
2619
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
2620
        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.
2621
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2622
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
2623
            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.
2624
                return False
2625
            return True
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2626
1587.1.10 by Robert Collins
update updates working tree and branch together.
2627
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2628
    def update(self, possible_transports=None):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2629
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
2630
2631
        :return: None or the last_revision that was pivoted out during the
2632
                 update.
2633
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2634
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
2635
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2636
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
2637
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2638
            if self.repository.get_graph().is_ancestor(old_tip,
2639
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
2640
                return None
2641
            return old_tip
2642
        return None
2643
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2644
    def _read_last_revision_info(self):
2645
        revision_string = self._transport.get_bytes('last-revision')
2646
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2647
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2648
        revno = int(revno)
2649
        return revno, revision_id
2650
2651
    def _write_last_revision_info(self, revno, revision_id):
2652
        """Simply write out the revision id, with no checks.
2653
2654
        Use set_last_revision_info to perform this safely.
2655
2656
        Does not update the revision_history cache.
2657
        """
2658
        revision_id = _mod_revision.ensure_null(revision_id)
2659
        out_string = '%d %s\n' % (revno, revision_id)
2660
        self._transport.put_bytes('last-revision', out_string,
2661
            mode=self.bzrdir._get_file_mode())
2662
2663
2664
class FullHistoryBzrBranch(BzrBranch):
2665
    """Bzr branch which contains the full revision history."""
2666
2667
    @needs_write_lock
2668
    def set_last_revision_info(self, revno, revision_id):
5718.8.12 by Jelmer Vernooij
Fix raising of InvalidRevisionId.
2669
        if not revision_id or not isinstance(revision_id, basestring):
2670
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2671
        revision_id = _mod_revision.ensure_null(revision_id)
2672
        # this old format stores the full history, but this api doesn't
2673
        # provide it, so we must generate, and might as well check it's
2674
        # correct
2675
        history = self._lefthand_history(revision_id)
2676
        if len(history) != revno:
2677
            raise AssertionError('%d != %d' % (len(history), revno))
2678
        self._set_revision_history(history)
2679
2680
    def _read_last_revision_info(self):
2681
        rh = self.revision_history()
2682
        revno = len(rh)
2683
        if revno:
2684
            return (revno, rh[-1])
2685
        else:
2686
            return (0, _mod_revision.NULL_REVISION)
2687
2688
    @deprecated_method(deprecated_in((2, 4, 0)))
2689
    @needs_write_lock
2690
    def set_revision_history(self, rev_history):
2691
        """See Branch.set_revision_history."""
2692
        self._set_revision_history(rev_history)
2693
2694
    def _set_revision_history(self, rev_history):
2695
        if 'evil' in debug.debug_flags:
2696
            mutter_callsite(3, "set_revision_history scales with history.")
2697
        check_not_reserved_id = _mod_revision.check_not_reserved_id
2698
        for rev_id in rev_history:
2699
            check_not_reserved_id(rev_id)
2700
        if Branch.hooks['post_change_branch_tip']:
2701
            # Don't calculate the last_revision_info() if there are no hooks
2702
            # that will use it.
2703
            old_revno, old_revid = self.last_revision_info()
2704
        if len(rev_history) == 0:
2705
            revid = _mod_revision.NULL_REVISION
2706
        else:
2707
            revid = rev_history[-1]
2708
        self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2709
        self._write_revision_history(rev_history)
2710
        self._clear_cached_state()
2711
        self._cache_revision_history(rev_history)
2712
        for hook in Branch.hooks['set_rh']:
2713
            hook(self, rev_history)
2714
        if Branch.hooks['post_change_branch_tip']:
2715
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2716
2717
    def _write_revision_history(self, history):
2718
        """Factored out of set_revision_history.
2719
2720
        This performs the actual writing to disk.
2721
        It is intended to be called by set_revision_history."""
2722
        self._transport.put_bytes(
2723
            'revision-history', '\n'.join(history),
2724
            mode=self.bzrdir._get_file_mode())
2725
2726
    def _gen_revision_history(self):
2727
        history = self._transport.get_bytes('revision-history').split('\n')
2728
        if history[-1:] == ['']:
2729
            # There shouldn't be a trailing newline, but just in case.
2730
            history.pop()
2731
        return history
2732
2733
    def _synchronize_history(self, destination, revision_id):
5718.8.11 by Jelmer Vernooij
Fix _synchronize_history check.
2734
        if not isinstance(destination, FullHistoryBzrBranch):
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2735
            super(BzrBranch, self)._synchronize_history(
2736
                destination, revision_id)
2737
            return
2738
        if revision_id == _mod_revision.NULL_REVISION:
2739
            new_history = []
2740
        else:
2741
            new_history = self.revision_history()
2742
        if revision_id is not None and new_history != []:
2743
            try:
2744
                new_history = new_history[:new_history.index(revision_id) + 1]
2745
            except ValueError:
2746
                rev = self.repository.get_revision(revision_id)
2747
                new_history = rev.get_history(self.repository)[1:]
2748
        destination._set_revision_history(new_history)
2749
5718.8.6 by Jelmer Vernooij
Move generate_revision_history.
2750
    @needs_write_lock
2751
    def generate_revision_history(self, revision_id, last_rev=None,
2752
        other_branch=None):
2753
        """Create a new revision history that will finish with revision_id.
2754
2755
        :param revision_id: the new tip to use.
2756
        :param last_rev: The previous last_revision. If not None, then this
2757
            must be a ancestory of revision_id, or DivergedBranches is raised.
2758
        :param other_branch: The other branch that DivergedBranches should
2759
            raise with respect to.
2760
        """
2761
        self._set_revision_history(self._lefthand_history(revision_id,
2762
            last_rev, other_branch))
2763
5718.8.2 by Jelmer Vernooij
Split out full history branch code.
2764
2765
class BzrBranch5(FullHistoryBzrBranch):
2766
    """A format 5 branch. This supports new features over plain branches.
2767
2768
    It has support for a master_branch which is the data for bound branches.
2769
    """
2770
2771
2772
class BzrBranch8(BzrBranch):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2773
    """A branch that stores tree-reference locations."""
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2774
2775
    def _open_hook(self):
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2776
        if self._ignore_fallbacks:
2777
            return
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2778
        try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2779
            url = self.get_stacked_on_url()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2780
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2781
            errors.UnstackableBranchFormat):
2782
            pass
2783
        else:
3770.2.1 by Michael Hudson
test and feature
2784
            for hook in Branch.hooks['transform_fallback_location']:
2785
                url = hook(self, url)
3770.2.3 by Michael Hudson
check for None being returned for a hook
2786
                if url is None:
2787
                    hook_name = Branch.hooks.get_hook_name(hook)
2788
                    raise AssertionError(
2789
                        "'transform_fallback_location' hook %s returned "
2790
                        "None, not a URL." % hook_name)
4379.2.2 by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly.
2791
            self._activate_fallback_location(url)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2792
4160.2.8 by Andrew Bennetts
Slightly less messy BzrBranch7.__init__.
2793
    def __init__(self, *args, **kwargs):
2794
        self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2795
        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.
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
2799
    def _clear_cached_state(self):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2800
        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.
2801
        self._last_revision_info_cache = None
4273.1.15 by Aaron Bentley
Add reference_info caching.
2802
        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.
2803
2230.3.32 by Aaron Bentley
Implement strict history policy
2804
    def _check_history_violation(self, revision_id):
5718.8.23 by Jelmer Vernooij
Avoid Branch._lefthand_history when checking for history violations.
2805
        current_revid = self.last_revision()
2806
        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
2807
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
2808
            return
5718.8.23 by Jelmer Vernooij
Avoid Branch._lefthand_history when checking for history violations.
2809
        graph = self.repository.get_graph()
2810
        for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2811
            if lh_ancestor == current_revid:
2812
                return
2813
        raise errors.AppendRevisionsOnlyViolation(self.user_url)
2230.3.32 by Aaron Bentley
Implement strict history policy
2814
2230.4.1 by Aaron Bentley
Get log as fast branch5
2815
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2816
        """Generate the revision history from last revision
2817
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2818
        last_revno, last_revision = self.last_revision_info()
2819
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2820
        return list(reversed(self._partial_revision_history_cache))
2821
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2822
    @needs_write_lock
2823
    def _set_parent_location(self, url):
2824
        """Set the parent branch"""
2825
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2826
2827
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2828
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2829
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2830
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2831
4273.1.15 by Aaron Bentley
Add reference_info caching.
2832
    @needs_write_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2833
    def _set_all_reference_info(self, info_dict):
2834
        """Replace all reference info stored in a branch.
2835
2836
        :param info_dict: A dict of {file_id: (tree_path, branch_location)}
2837
        """
2838
        s = StringIO()
2839
        writer = rio.RioWriter(s)
2840
        for key, (tree_path, branch_location) in info_dict.iteritems():
2841
            stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2842
                                branch_location=branch_location)
2843
            writer.write_stanza(stanza)
2844
        self._transport.put_bytes('references', s.getvalue())
4273.1.15 by Aaron Bentley
Add reference_info caching.
2845
        self._reference_info = info_dict
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2846
4273.1.15 by Aaron Bentley
Add reference_info caching.
2847
    @needs_read_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2848
    def _get_all_reference_info(self):
2849
        """Return all the reference info stored in a branch.
2850
2851
        :return: A dict of {file_id: (tree_path, branch_location)}
2852
        """
4273.1.15 by Aaron Bentley
Add reference_info caching.
2853
        if self._reference_info is not None:
2854
            return self._reference_info
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2855
        rio_file = self._transport.get('references')
2856
        try:
2857
            stanzas = rio.read_stanzas(rio_file)
2858
            info_dict = dict((s['file_id'], (s['tree_path'],
2859
                             s['branch_location'])) for s in stanzas)
2860
        finally:
2861
            rio_file.close()
4273.1.15 by Aaron Bentley
Add reference_info caching.
2862
        self._reference_info = info_dict
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2863
        return info_dict
2864
2865
    def set_reference_info(self, file_id, tree_path, branch_location):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2866
        """Set the branch location to use for a tree reference.
2867
2868
        :param file_id: The file-id of the tree reference.
2869
        :param tree_path: The path of the tree reference in the tree.
2870
        :param branch_location: The location of the branch to retrieve tree
2871
            references from.
2872
        """
2873
        info_dict = self._get_all_reference_info()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2874
        info_dict[file_id] = (tree_path, branch_location)
2875
        if None in (tree_path, branch_location):
2876
            if tree_path is not None:
2877
                raise ValueError('tree_path must be None when branch_location'
2878
                                 ' is None.')
2879
            if branch_location is not None:
2880
                raise ValueError('branch_location must be None when tree_path'
2881
                                 ' is None.')
2882
            del info_dict[file_id]
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2883
        self._set_all_reference_info(info_dict)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2884
2885
    def get_reference_info(self, file_id):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2886
        """Get the tree_path and branch_location for a tree reference.
2887
2888
        :return: a tuple of (tree_path, branch_location)
2889
        """
2890
        return self._get_all_reference_info().get(file_id, (None, None))
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2891
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2892
    def reference_parent(self, file_id, path, possible_transports=None):
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2893
        """Return the parent branch for a tree-reference file_id.
2894
2895
        :param file_id: The file_id of the tree reference
2896
        :param path: The path of the file_id in the tree
2897
        :return: A branch associated with the file_id
2898
        """
2899
        branch_location = self.get_reference_info(file_id)[1]
2900
        if branch_location is None:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2901
            return Branch.reference_parent(self, file_id, path,
2902
                                           possible_transports)
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2903
        branch_location = urlutils.join(self.user_url, branch_location)
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2904
        return Branch.open(branch_location,
2905
                           possible_transports=possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2906
2230.3.3 by Aaron Bentley
Add more config testing
2907
    def set_push_location(self, location):
2908
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2909
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2910
2911
    def set_bound_location(self, location):
2912
        """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.
2913
        self._master_branch_cache = None
2230.3.7 by Aaron Bentley
Fix binding return values
2914
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2915
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2916
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2917
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2918
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2919
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2920
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2921
                return True
2922
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2923
            self._set_config_location('bound_location', location,
2924
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2925
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2926
        return True
2927
2928
    def _get_bound_location(self, bound):
2929
        """Return the bound location in the config file.
2930
2931
        Return None if the bound parameter does not match"""
2932
        config = self.get_config()
2933
        config_bound = (config.get_user_option('bound') == 'True')
2934
        if config_bound != bound:
2935
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2936
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2937
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2938
    def get_bound_location(self):
2939
        """See Branch.set_push_location."""
2940
        return self._get_bound_location(True)
2941
2942
    def get_old_bound_location(self):
2943
        """See Branch.get_old_bound_location"""
2944
        return self._get_bound_location(False)
2945
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2946
    def get_stacked_on_url(self):
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2947
        # you can always ask for the URL; but you might not be able to use it
2948
        # if the repo can't support stacking.
2949
        ## self._check_stackable_repo()
5993.4.1 by Andrew Bennetts
Make Branch.open more than 3x faster.
2950
        # stacked_on_location is only ever defined in branch.conf, so don't
2951
        # waste effort reading the whole stack of config files.
2952
        config = self.get_config()._get_branch_data_config()
2953
        stacked_url = self._get_config_location('stacked_on_location',
2954
            config=config)
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2955
        if stacked_url is None:
3221.11.6 by Robert Collins
Stackable branch fixes.
2956
            raise errors.NotStacked(self)
2957
        return stacked_url
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2958
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2959
    def _get_append_revisions_only(self):
4989.2.13 by Vincent Ladeuil
append_revisions_only accept all valid booleans, update doc to
2960
        return self.get_config(
2961
            ).get_user_option_as_bool('append_revisions_only')
2230.3.32 by Aaron Bentley
Implement strict history policy
2962
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
2963
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2964
    def get_rev_id(self, revno, history=None):
2965
        """Find the revision id of the specified revno."""
2966
        if revno == 0:
2967
            return _mod_revision.NULL_REVISION
2968
2969
        last_revno, last_revision_id = self.last_revision_info()
2970
        if revno <= 0 or revno > last_revno:
2971
            raise errors.NoSuchRevision(self, revno)
2972
2973
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
2974
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2975
3298.2.10 by Aaron Bentley
Refactor partial history code
2976
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
2977
        if len(self._partial_revision_history_cache) <= index:
2978
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
2979
        if len(self._partial_revision_history_cache) > index:
2980
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2981
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2982
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2983
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2984
    @needs_read_lock
2985
    def revision_id_to_revno(self, revision_id):
2986
        """Given a revision id, return its revno"""
2987
        if _mod_revision.is_null(revision_id):
2988
            return 0
2989
        try:
2990
            index = self._partial_revision_history_cache.index(revision_id)
2991
        except ValueError:
5689.2.1 by Jelmer Vernooij
Properly raise GhostsHaveNoRevno in revision_id_to_revno.
2992
            try:
2993
                self._extend_partial_history(stop_revision=revision_id)
2994
            except errors.RevisionNotPresent, e:
2995
                raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2996
            index = len(self._partial_revision_history_cache) - 1
2997
            if self._partial_revision_history_cache[index] != revision_id:
2998
                raise errors.NoSuchRevision(self, revision_id)
2999
        return self.revno() - index
3000
2230.3.34 by Aaron Bentley
cleanup
3001
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
3002
class BzrBranch7(BzrBranch8):
3003
    """A branch with support for a fallback repository."""
3004
3005
    def set_reference_info(self, file_id, tree_path, branch_location):
3006
        Branch.set_reference_info(self, file_id, tree_path, branch_location)
3007
3008
    def get_reference_info(self, file_id):
3009
        Branch.get_reference_info(self, file_id)
3010
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
3011
    def reference_parent(self, file_id, path, possible_transports=None):
3012
        return Branch.reference_parent(self, file_id, path,
3013
                                       possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
3014
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
3015
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3016
class BzrBranch6(BzrBranch7):
3017
    """See BzrBranchFormat6 for the capabilities of this branch.
3018
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
3019
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
3020
    i.e. stacking.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3021
    """
3022
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
3023
    def get_stacked_on_url(self):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
3024
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3025
3026
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3027
######################################################################
3028
# results of operations
3029
2220.2.37 by Martin Pool
Report conflicting tags from push.
3030
3031
class _Result(object):
3032
3033
    def _show_tag_conficts(self, to_file):
3034
        if not getattr(self, 'tag_conflicts', None):
3035
            return
3036
        to_file.write('Conflicting tags:\n')
3037
        for name, value1, value2 in self.tag_conflicts:
3038
            to_file.write('    %s\n' % (name, ))
3039
3040
3041
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3042
    """Result of a Branch.pull operation.
3043
3044
    :ivar old_revno: Revision number before pull.
3045
    :ivar new_revno: Revision number after pull.
3046
    :ivar old_revid: Tip revision id before pull.
3047
    :ivar new_revid: Tip revision id after pull.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3048
    :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.
3049
    :ivar master_branch: Master branch of the target, or the target if no
3050
        Master
3051
    :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.
3052
    :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.
3053
    :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
3054
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3055
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3056
    @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()
3057
    def __int__(self):
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3058
        """Return the relative change in revno.
3059
3060
        :deprecated: Use `new_revno` and `old_revno` instead.
3061
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3062
        return self.new_revno - self.old_revno
3063
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
3064
    def report(self, to_file):
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
3065
        if not is_quiet():
3066
            if self.old_revid == self.new_revid:
3067
                to_file.write('No revisions to pull.\n')
3068
            else:
3069
                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
3070
        self._show_tag_conficts(to_file)
3071
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3072
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
3073
class BranchPushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3074
    """Result of a Branch.push operation.
3075
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3076
    :ivar old_revno: Revision number (eg 10) of the target before push.
3077
    :ivar new_revno: Revision number (eg 12) of the target after push.
3078
    :ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3079
        before the push.
3080
    :ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3081
        after the push.
3082
    :ivar source_branch: Source branch object that the push was from. This is
3083
        read locked, and generally is a local (and thus low latency) branch.
3084
    :ivar master_branch: If target is a bound branch, the master branch of
3085
        target, or target itself. Always write locked.
3086
    :ivar target_branch: The direct Branch where data is being sent (write
3087
        locked).
3088
    :ivar local_branch: If the target is a bound branch this will be the
3089
        target, otherwise it will be None.
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3090
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3091
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3092
    @deprecated_method(deprecated_in((2, 3, 0)))
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3093
    def __int__(self):
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3094
        """Return the relative change in revno.
3095
3096
        :deprecated: Use `new_revno` and `old_revno` instead.
3097
        """
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
3098
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3099
2220.2.37 by Martin Pool
Report conflicting tags from push.
3100
    def report(self, to_file):
3101
        """Write a human-readable description of the result."""
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3102
        if self.old_revid == self.new_revid:
3978.2.2 by Jelmer Vernooij
Write status messages during push to stderr rather than stdout.
3103
            note('No new revisions to push.')
2220.2.37 by Martin Pool
Report conflicting tags from push.
3104
        else:
3978.2.2 by Jelmer Vernooij
Write status messages during push to stderr rather than stdout.
3105
            note('Pushed up to revision %d.' % self.new_revno)
2220.2.37 by Martin Pool
Report conflicting tags from push.
3106
        self._show_tag_conficts(to_file)
3107
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3108
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3109
class BranchCheckResult(object):
3110
    """Results of checking branch consistency.
3111
3112
    :see: Branch.check
3113
    """
3114
3115
    def __init__(self, branch):
3116
        self.branch = branch
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
3117
        self.errors = []
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3118
3119
    def report_results(self, verbose):
3120
        """Report the check results via trace.note.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3121
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3122
        :param verbose: Requests more detailed display of what was checked,
3123
            if any.
3124
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
3125
        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.
3126
            self.branch._format)
3127
        for error in self.errors:
3128
            note('found error:%s', error)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3129
3130
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3131
class Converter5to6(object):
3132
    """Perform an in-place upgrade of format 5 to format 6"""
3133
3134
    def convert(self, branch):
3135
        # Data for 5 and 6 can peacefully coexist.
3136
        format = BzrBranchFormat6()
3137
        new_branch = format.open(branch.bzrdir, _found=True)
3138
3139
        # 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.
3140
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3141
        new_branch.set_parent(branch.get_parent())
3142
        new_branch.set_bound_location(branch.get_bound_location())
3143
        new_branch.set_push_location(branch.get_push_location())
3144
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
3145
        # New branch has no tags by default
3146
        new_branch.tags._set_tag_dict({})
3147
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3148
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3149
        new_branch._transport.put_bytes('format',
3150
            format.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
3151
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3152
3153
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
3154
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3155
        try:
3156
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
3157
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3158
            pass
3159
        branch.set_bound_location(None)
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
3160
3161
3162
class Converter6to7(object):
3163
    """Perform an in-place upgrade of format 6 to format 7"""
3164
3165
    def convert(self, branch):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3166
        format = BzrBranchFormat7()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
3167
        branch._set_config_location('stacked_on_location', '')
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
3168
        # update target format
3221.13.5 by Ian Clatworthy
fix LockableFiles deprecations
3169
        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()
3170
3171
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3172
class Converter7to8(object):
3173
    """Perform an in-place upgrade of format 6 to format 7"""
3174
3175
    def convert(self, branch):
3176
        format = BzrBranchFormat8()
3177
        branch._transport.put_bytes('references', '')
3178
        # update target format
3179
        branch._transport.put_bytes('format', format.get_format_string())
3180
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
3181
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3182
class InterBranch(InterObject):
3183
    """This class represents operations taking place between two branches.
3184
3185
    Its instances have methods like pull() and push() and contain
3186
    references to the source and target repositories these operations
3187
    can be carried out on.
3188
    """
3189
3190
    _optimisers = []
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3191
    """The available optimised InterBranch types."""
3192
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
3193
    @classmethod
3194
    def _get_branch_formats_to_test(klass):
3195
        """Return an iterable of format tuples for testing.
3196
        
3197
        :return: An iterable of (from_format, to_format) to use when testing
3198
            this InterBranch class. Each InterBranch class should define this
3199
            method itself.
3200
        """
3201
        raise NotImplementedError(klass._get_branch_formats_to_test)
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3202
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3203
    @needs_write_lock
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3204
    def pull(self, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3205
             possible_transports=None, local=False):
4000.5.10 by Jelmer Vernooij
Fix comment for InterBranch.pull.
3206
        """Mirror source into target branch.
3207
3208
        The target branch is considered to be 'local', having low latency.
3209
3210
        :returns: PullResult instance
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3211
        """
3212
        raise NotImplementedError(self.pull)
3213
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3214
    @needs_write_lock
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
3215
    def push(self, overwrite=False, stop_revision=None, lossy=False,
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3216
             _override_hook_source_branch=None):
3217
        """Mirror the source branch into the target branch.
3218
3219
        The source branch is considered to be 'local', having low latency.
3220
        """
3221
        raise NotImplementedError(self.push)
3222
5358.1.1 by Jelmer Vernooij
Add stub for InterBranch.copy_content_into.
3223
    @needs_write_lock
3224
    def copy_content_into(self, revision_id=None):
3225
        """Copy the content of source into target
3226
3227
        revision_id: if not None, the revision history in the new branch will
3228
                     be truncated to end with revision_id.
3229
        """
3230
        raise NotImplementedError(self.copy_content_into)
3231
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3232
    @needs_write_lock
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
3233
    def fetch(self, stop_revision=None, limit=None):
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3234
        """Fetch revisions.
3235
3236
        :param stop_revision: Last revision to fetch
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
3237
        :param limit: Optional rough limit of revisions to fetch
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3238
        """
3239
        raise NotImplementedError(self.fetch)
3240
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3241
3242
class GenericInterBranch(InterBranch):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3243
    """InterBranch implementation that uses public Branch functions."""
3244
3245
    @classmethod
3246
    def is_compatible(klass, source, target):
3247
        # GenericBranch uses the public API, so always compatible
3248
        return True
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3249
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
3250
    @classmethod
3251
    def _get_branch_formats_to_test(klass):
5662.2.2 by Jelmer Vernooij
Move most format registration functions to BranchFormatRegistry.
3252
        return [(format_registry.get_default(), format_registry.get_default())]
4000.5.3 by Jelmer Vernooij
Add tests for InterBranch.
3253
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3254
    @classmethod
3255
    def unwrap_format(klass, format):
3256
        if isinstance(format, remote.RemoteBranchFormat):
3257
            format._ensure_real()
3258
            return format._custom_format
5050.53.4 by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge.
3259
        return format
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3260
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3261
    @needs_write_lock
3262
    def copy_content_into(self, revision_id=None):
3263
        """Copy the content of source into target
3264
3265
        revision_id: if not None, the revision history in the new branch will
3266
                     be truncated to end with revision_id.
3267
        """
3268
        self.source.update_references(self.target)
3269
        self.source._synchronize_history(self.target, revision_id)
3270
        try:
3271
            parent = self.source.get_parent()
3272
        except errors.InaccessibleParent, e:
3273
            mutter('parent was not accessible to copy: %s', e)
3274
        else:
3275
            if parent:
3276
                self.target.set_parent(parent)
3277
        if self.source._push_should_merge_tags():
5284.4.3 by Robert Collins
Fix missed self.source change in copy_content_into.
3278
            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
3279
3280
    @needs_write_lock
5852.1.1 by Jelmer Vernooij
Add limit argument to Branch.fetch.
3281
    def fetch(self, stop_revision=None, limit=None):
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3282
        if self.target.base == self.source.base:
3283
            return (0, [])
3284
        self.source.lock_read()
3285
        try:
5741.1.6 by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch.
3286
            fetch_spec_factory = fetch.FetchSpecFactory()
3287
            fetch_spec_factory.source_branch = self.source
3288
            fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3289
            fetch_spec_factory.source_repo = self.source.repository
3290
            fetch_spec_factory.target_repo = self.target.repository
3291
            fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
5852.1.5 by Andrew Bennetts, Jelmer Vernooij
Support limit= for fetching between Bazaar branches.
3292
            fetch_spec_factory.limit = limit
5741.1.6 by Jelmer Vernooij
Add stop_revision argument to Branch.heads_to_fetch.
3293
            fetch_spec = fetch_spec_factory.make_fetch_spec()
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3294
            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.
3295
                fetch_spec=fetch_spec)
5741.1.1 by Jelmer Vernooij
Move fetch implementation to InterBranch.
3296
        finally:
3297
            self.source.unlock()
3298
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
3299
    @needs_write_lock
3300
    def _update_revisions(self, stop_revision=None, overwrite=False,
5809.2.4 by Jelmer Vernooij
remove unused argument.
3301
            graph=None):
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3302
        other_revno, other_last_revision = self.source.last_revision_info()
3303
        stop_revno = None # unknown
3304
        if stop_revision is None:
3305
            stop_revision = other_last_revision
3306
            if _mod_revision.is_null(stop_revision):
3307
                # if there are no commits, we're done.
3308
                return
3309
            stop_revno = other_revno
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3310
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3311
        # what's the current last revision, before we fetch [and change it
3312
        # possibly]
3313
        last_rev = _mod_revision.ensure_null(self.target.last_revision())
3314
        # we fetch here so that we don't process data twice in the common
3315
        # case of having something to pull, and so that the check for
3316
        # already merged can operate on the just fetched graph, which will
3317
        # be cached in memory.
5741.1.8 by Jelmer Vernooij
Remove fetch_tags argument.
3318
        self.fetch(stop_revision=stop_revision)
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3319
        # Check to see if one is an ancestor of the other
3320
        if not overwrite:
3321
            if graph is None:
3322
                graph = self.target.repository.get_graph()
3323
            if self.target._check_if_descendant_or_diverged(
3324
                    stop_revision, last_rev, graph, self.source):
3325
                # stop_revision is a descendant of last_rev, but we aren't
3326
                # overwriting, so we're done.
3327
                return
3328
        if stop_revno is None:
3329
            if graph is None:
3330
                graph = self.target.repository.get_graph()
3331
            this_revno, this_last_revision = \
3332
                    self.target.last_revision_info()
3333
            stop_revno = graph.find_distance_to_null(stop_revision,
3334
                            [(other_last_revision, other_revno),
3335
                             (this_last_revision, this_revno)])
3336
        self.target.set_last_revision_info(stop_revno, stop_revision)
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3337
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3338
    @needs_write_lock
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3339
    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
3340
             possible_transports=None, run_hooks=True,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3341
             _override_hook_target=None, local=False):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3342
        """Pull from source into self, updating my master if any.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3343
3344
        :param run_hooks: Private parameter - if false, this branch
3345
            is being called because it's the master of the primary branch,
3346
            so it should not run its hooks.
3347
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3348
        bound_location = self.target.get_bound_location()
3349
        if local and not bound_location:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3350
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3351
        master_branch = None
5609.50.1 by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files
3352
        source_is_master = False
3353
        if bound_location:
5609.50.2 by Vincent Ladeuil
Fix typos caught by Jonathan.
3354
            # bound_location comes from a config file, some care has to be
3355
            # taken to relate it to source.user_url
5609.50.1 by Vincent Ladeuil
Be more tolerant about ``bound_location`` from config files
3356
            normalized = urlutils.normalize_url(bound_location)
3357
            try:
3358
                relpath = self.source.user_transport.relpath(normalized)
3359
                source_is_master = (relpath == '')
3360
            except (errors.PathNotChild, errors.InvalidURL):
3361
                source_is_master = False
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3362
        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
3363
            # not pulling from master, so we need to update master.
3364
            master_branch = self.target.get_master_branch(possible_transports)
3365
            master_branch.lock_write()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3366
        try:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3367
            if master_branch:
3368
                # pull from source into master.
3369
                master_branch.pull(self.source, overwrite, stop_revision,
3370
                    run_hooks=False)
3371
            return self._pull(overwrite,
3372
                stop_revision, _hook_master=master_branch,
3373
                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.
3374
                _override_hook_target=_override_hook_target,
3375
                merge_tags_to_master=not source_is_master)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3376
        finally:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3377
            if master_branch:
3378
                master_branch.unlock()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3379
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
3380
    def push(self, overwrite=False, stop_revision=None, lossy=False,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3381
             _override_hook_source_branch=None):
3382
        """See InterBranch.push.
3383
3384
        This is the basic concrete implementation of push()
3385
5891.1.2 by Andrew Bennetts
Fix a bunch of docstring formatting nits, making pydoctor a bit happier.
3386
        :param _override_hook_source_branch: If specified, run the hooks
3387
            passing this Branch as the source, rather than self.  This is for
3388
            use of RemoteBranch, where push is delegated to the underlying
3389
            vfs-based Branch.
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3390
        """
5853.2.2 by Jelmer Vernooij
Make lossy_push an argument to InterBranch.push.
3391
        if lossy:
3392
            raise errors.LossyPushToSameVCS(self.source, self.target)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3393
        # TODO: Public option to disable running hooks - should be trivial but
3394
        # needs tests.
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3395
3396
        op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3397
        op.add_cleanup(self.source.lock_read().unlock)
3398
        op.add_cleanup(self.target.lock_write().unlock)
3399
        return op.run(overwrite, stop_revision,
3400
            _override_hook_source_branch=_override_hook_source_branch)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3401
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3402
    def _basic_push(self, overwrite, stop_revision):
3403
        """Basic implementation of push without bound branches or hooks.
3404
3405
        Must be called with source read locked and target write locked.
3406
        """
3407
        result = BranchPushResult()
3408
        result.source_branch = self.source
3409
        result.target_branch = self.target
3410
        result.old_revno, result.old_revid = self.target.last_revision_info()
3411
        self.source.update_references(self.target)
3412
        if result.old_revid != stop_revision:
3413
            # We assume that during 'push' this repository is closer than
3414
            # the target.
3415
            graph = self.source.repository.get_graph(self.target.repository)
3416
            self._update_revisions(stop_revision, overwrite=overwrite,
3417
                    graph=graph)
3418
        if self.source._push_should_merge_tags():
3419
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3420
                overwrite)
3421
        result.new_revno, result.new_revid = self.target.last_revision_info()
3422
        return result
3423
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3424
    def _push_with_bound_branches(self, operation, overwrite, stop_revision,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3425
            _override_hook_source_branch=None):
3426
        """Push from source into target, and into target's master if any.
3427
        """
3428
        def _run_hooks():
3429
            if _override_hook_source_branch:
3430
                result.source_branch = _override_hook_source_branch
3431
            for hook in Branch.hooks['post_push']:
3432
                hook(result)
3433
3434
        bound_location = self.target.get_bound_location()
3435
        if bound_location and self.target.base != bound_location:
3436
            # there is a master branch.
3437
            #
3438
            # XXX: Why the second check?  Is it even supported for a branch to
3439
            # be bound to itself? -- mbp 20070507
3440
            master_branch = self.target.get_master_branch()
3441
            master_branch.lock_write()
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3442
            operation.add_cleanup(master_branch.unlock)
3443
            # push into the master from the source branch.
3444
            master_inter = InterBranch.get(self.source, master_branch)
3445
            master_inter._basic_push(overwrite, stop_revision)
3446
            # and push into the target branch from the source. Note that
3447
            # we push from the source branch again, because it's considered
3448
            # the highest bandwidth repository.
3449
            result = self._basic_push(overwrite, stop_revision)
3450
            result.master_branch = master_branch
3451
            result.local_branch = self.target
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3452
        else:
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3453
            master_branch = None
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3454
            # no master branch
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3455
            result = self._basic_push(overwrite, stop_revision)
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3456
            # TODO: Why set master_branch and local_branch if there's no
3457
            # binding?  Maybe cleaner to just leave them unset? -- mbp
3458
            # 20070504
3459
            result.master_branch = self.target
3460
            result.local_branch = None
5915.1.1 by Andrew Bennetts
Removed bzrlib.branch._run_with_write_locked_target. Use bzrlib.cleanup instead.
3461
        _run_hooks()
3462
        return result
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3463
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3464
    def _pull(self, overwrite=False, stop_revision=None,
3465
             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.
3466
             _override_hook_target=None, local=False,
3467
             merge_tags_to_master=True):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3468
        """See Branch.pull.
3469
3470
        This function is the core worker, used by GenericInterBranch.pull to
3471
        avoid duplication when pulling source->master and source->local.
3472
3473
        :param _hook_master: Private parameter - set the branch to
3474
            be supplied as the master to pull hooks.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3475
        :param run_hooks: Private parameter - if false, this branch
3476
            is being called because it's the master of the primary branch,
3477
            so it should not run its hooks.
5662.2.6 by Jelmer Vernooij
add more tests.
3478
            is being called because it's the master of the primary branch,
3479
            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
3480
        :param _override_hook_target: Private parameter - set the branch to be
3481
            supplied as the target_branch to pull hooks.
3482
        :param local: Only update the local branch, and not the bound branch.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3483
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3484
        # This type of branch can't be bound.
3485
        if local:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3486
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3487
        result = PullResult()
3488
        result.source_branch = self.source
3489
        if _override_hook_target is None:
3490
            result.target_branch = self.target
3491
        else:
3492
            result.target_branch = _override_hook_target
3493
        self.source.lock_read()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3494
        try:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3495
            # We assume that during 'pull' the target repository is closer than
3496
            # the source one.
3497
            self.source.update_references(self.target)
3498
            graph = self.target.repository.get_graph(self.source.repository)
3499
            # TODO: Branch formats should have a flag that indicates 
3500
            # that revno's are expensive, and pull() should honor that flag.
3501
            # -- JRV20090506
3502
            result.old_revno, result.old_revid = \
3503
                self.target.last_revision_info()
5809.2.3 by Jelmer Vernooij
Kill update_revisions private implementation.
3504
            self._update_revisions(stop_revision, overwrite=overwrite,
5809.2.1 by Jelmer Vernooij
Deprecate Branch.update_revisions.
3505
                graph=graph)
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3506
            # TODO: The old revid should be specified when merging tags, 
3507
            # so a tags implementation that versions tags can only 
3508
            # pull in the most recent changes. -- JRV20090506
3509
            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.
3510
                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
3511
            result.new_revno, result.new_revid = self.target.last_revision_info()
3512
            if _hook_master:
3513
                result.master_branch = _hook_master
3514
                result.local_branch = result.target_branch
3515
            else:
3516
                result.master_branch = result.target_branch
3517
                result.local_branch = None
3518
            if run_hooks:
3519
                for hook in Branch.hooks['post_pull']:
3520
                    hook(result)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3521
        finally:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3522
            self.source.unlock()
3523
        return result
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3524
3525
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3526
InterBranch.register_optimiser(GenericInterBranch)