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