/brz/remove-bazaar

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