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