/brz/remove-bazaar

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