/brz/remove-bazaar

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