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