/brz/remove-bazaar

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