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