/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
1
# Copyright (C) 2005-2011 Canonical Ltd
1553.5.70 by Martin Pool
doc
2
#
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1553.5.70 by Martin Pool
doc
7
#
1 by mbp at sourcefrog
import from baz patch-364
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1553.5.70 by Martin Pool
doc
12
#
1 by mbp at sourcefrog
import from baz patch-364
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1 by mbp at sourcefrog
import from baz patch-364
16
17
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
18
from cStringIO import StringIO
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
19
import sys
20
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
3221.13.2 by Robert Collins
Add a shallow parameter to bzrdir.sprout, which involved fixing a lateny bug in pack to pack fetching with ghost discovery.
23
from itertools import chain
1551.8.4 by Aaron Bentley
Tweak import style
24
from bzrlib import (
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
25
        bzrdir,
26
        cache_utf8,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
27
        config as _mod_config,
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
        """
5582.4.2 by Jelmer Vernooij
Split out split-out specific code (in preparation of move to bzrlib.plugins.weave_fmt).
1383
        format = self.repository.bzrdir.checkout_metadir()
1384
        format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
1385
        return format
1386
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1387
    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.
1388
        stacked_on=None, create_prefix=False, use_existing_dir=False,
1389
        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.
1390
        """Create a clone of this branch and its bzrdir.
1391
1392
        :param to_transport: The transport to clone onto.
1393
        :param revision_id: The revision id to use as tip in the new branch.
1394
            If None the tip is obtained from this branch.
1395
        :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.
1396
        :param create_prefix: Create any missing directories leading up to
1397
            to_transport.
1398
        :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.
1399
        """
4044.1.2 by Robert Collins
Reinstate the TODO comment about bzrdir.clone_on_transport.
1400
        # XXX: Fix the bzrdir API to allow getting the branch back from the
1401
        # clone call. Or something. 20090224 RBC/spiv.
5147.4.1 by Jelmer Vernooij
Pass branch names in more places.
1402
        # XXX: Should this perhaps clone colocated branches as well, 
1403
        # 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.
1404
        if revision_id is None:
1405
            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.
1406
        dir_to = self.bzrdir.clone_on_transport(to_transport,
1407
            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.
1408
            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.
1409
            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.
1410
        return dir_to.open_branch()
1411
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1412
    def create_checkout(self, to_location, revision_id=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1413
                        lightweight=False, accelerator_tree=None,
1414
                        hardlink=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1415
        """Create a checkout of a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1416
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1417
        :param to_location: The url to produce the checkout at
1418
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
1419
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1420
        produce a bound branch (heavyweight checkout)
3123.5.17 by Aaron Bentley
Update docs
1421
        :param accelerator_tree: A tree which can be used for retrieving file
1422
            contents more quickly than the revision tree, i.e. a workingtree.
1423
            The revision tree will be used for cases where accelerator_tree's
1424
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1425
        :param hardlink: If true, hard-link files from accelerator_tree,
1426
            where possible.
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1427
        :return: The tree of the created checkout
1428
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
1429
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1430
        t.ensure_base()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1431
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
1432
            format = self._get_checkout_format()
1433
            checkout = format.initialize_on_transport(t)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1434
            from_branch = BranchReferenceFormat().initialize(checkout, 
1435
                target_branch=self)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1436
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
1437
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1438
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
1439
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1440
            checkout = checkout_branch.bzrdir
1441
            checkout_branch.bind(self)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1442
            # 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
1443
            # branch tip correctly, and seed it with history.
1444
            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.
1445
            from_branch=None
1446
        tree = checkout.create_workingtree(revision_id,
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1447
                                           from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1448
                                           accelerator_tree=accelerator_tree,
1449
                                           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.
1450
        basis_tree = tree.basis_tree()
1451
        basis_tree.lock_read()
1452
        try:
1453
            for path, file_id in basis_tree.iter_references():
1454
                reference_parent = self.reference_parent(file_id, path)
1455
                reference_parent.create_checkout(tree.abspath(path),
1456
                    basis_tree.get_reference_revision(file_id, path),
1457
                    lightweight)
1458
        finally:
1459
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1460
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1461
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
1462
    @needs_write_lock
1463
    def reconcile(self, thorough=True):
1464
        """Make sure the data stored in this branch is consistent."""
1465
        from bzrlib.reconcile import BranchReconciler
1466
        reconciler = BranchReconciler(self, thorough=thorough)
1467
        reconciler.reconcile()
1468
        return reconciler
1469
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
1470
    def reference_parent(self, file_id, path, possible_transports=None):
2100.3.29 by Aaron Bentley
Get merge working initially
1471
        """Return the parent branch for a tree-reference file_id
1472
        :param file_id: The file_id of the tree reference
1473
        :param path: The path of the file_id in the tree
1474
        :return: A branch associated with the file_id
1475
        """
1476
        # FIXME should provide multiple branches, based on config
5158.6.11 by Martin Pool
Revert some fragile dependencies of branch on .base
1477
        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
1478
                           possible_transports=possible_transports)
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
1479
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
1480
    def supports_tags(self):
1481
        return self._format.supports_tags()
1482
5086.4.7 by Jelmer Vernooij
Put automatic_tag_name on Branch.
1483
    def automatic_tag_name(self, revision_id):
1484
        """Try to automatically find the tag name for a revision.
1485
1486
        :param revision_id: Revision id of the revision.
5086.4.8 by Jelmer Vernooij
Review comments from Ian.
1487
        :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.
1488
        """
1489
        for hook in Branch.hooks['automatic_tag_name']:
1490
            ret = hook(self, revision_id)
1491
            if ret is not None:
1492
                return ret
1493
        return None
1494
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.
1495
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1496
                                         other_branch):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1497
        """Ensure that revision_b is a descendant of revision_a.
1498
1499
        This is a helper function for update_revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1500
3441.5.18 by Andrew Bennetts
Fix some test failures.
1501
        :raises: DivergedBranches if revision_b has diverged from revision_a.
1502
        :returns: True if revision_b is a descendant of revision_a.
1503
        """
1504
        relation = self._revision_relations(revision_a, revision_b, graph)
1505
        if relation == 'b_descends_from_a':
1506
            return True
1507
        elif relation == 'diverged':
1508
            raise errors.DivergedBranches(self, other_branch)
1509
        elif relation == 'a_descends_from_b':
1510
            return False
1511
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1512
            raise AssertionError("invalid relation: %r" % (relation,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1513
1514
    def _revision_relations(self, revision_a, revision_b, graph):
1515
        """Determine the relationship between two revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1516
3441.5.18 by Andrew Bennetts
Fix some test failures.
1517
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1518
        """
1519
        heads = graph.heads([revision_a, revision_b])
1520
        if heads == set([revision_b]):
1521
            return 'b_descends_from_a'
1522
        elif heads == set([revision_a, revision_b]):
1523
            # These branches have diverged
1524
            return 'diverged'
1525
        elif heads == set([revision_a]):
1526
            return 'a_descends_from_b'
1527
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1528
            raise AssertionError("invalid heads: %r" % (heads,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1529
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1530
1531
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1532
    """An encapsulation of the initialization and open routines for a format.
1533
1534
    Formats provide three things:
1535
     * An initialization routine,
1536
     * a format string,
1537
     * an open routine.
1538
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1539
    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
1540
    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
1541
    can be classes themselves with class methods - it simply depends on
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1542
    whether state is needed for a given format or not.
1543
1544
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1545
    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.
1546
    object will be created every time regardless.
1547
    """
1548
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1549
    _default_format = None
1550
    """The default format used for new branches."""
1551
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1552
    _formats = {}
1553
    """The known formats."""
1554
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.
1555
    can_set_append_revisions_only = True
1556
2363.5.5 by Aaron Bentley
add info.describe_format
1557
    def __eq__(self, other):
1558
        return self.__class__ is other.__class__
1559
1560
    def __ne__(self, other):
1561
        return not (self == other)
1562
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1563
    @classmethod
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1564
    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.
1565
        """Return the format for the branch object in a_bzrdir."""
1566
        try:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1567
            transport = a_bzrdir.get_branch_transport(None, name=name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
1568
            format_string = transport.get_bytes("format")
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1569
            format = klass._formats[format_string]
1570
            if isinstance(format, MetaDirBranchFormatFactory):
1571
                return format()
1572
            return format
3236.1.2 by Michael Hudson
clean up branch.py imports
1573
        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)
1574
            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.
1575
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
1576
            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.
1577
1578
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1579
    def get_default_format(klass):
1580
        """Return the current default format."""
1581
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1582
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1583
    @classmethod
1584
    def get_formats(klass):
1585
        """Get all the known formats.
1586
1587
        Warning: This triggers a load of all lazy registered formats: do not
1588
        use except when that is desireed.
1589
        """
1590
        result = []
1591
        for fmt in klass._formats.values():
1592
            if isinstance(fmt, MetaDirBranchFormatFactory):
1593
                fmt = fmt()
1594
            result.append(fmt)
1595
        return result
1596
5147.4.6 by Jelmer Vernooij
consistency in names
1597
    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.
1598
        """Get the target reference of the branch in a_bzrdir.
1599
1600
        format probing must have been completed before calling
1601
        this method - it is assumed that the format of the branch
1602
        in a_bzrdir is correct.
1603
1604
        :param a_bzrdir: The bzrdir to get the branch data from.
5147.4.6 by Jelmer Vernooij
consistency in names
1605
        :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.
1606
        :return: None if the branch is not a reference branch.
1607
        """
1608
        return None
1609
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1610
    @classmethod
5147.4.6 by Jelmer Vernooij
consistency in names
1611
    def set_reference(self, a_bzrdir, name, to_branch):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1612
        """Set the target reference of the branch in a_bzrdir.
1613
1614
        format probing must have been completed before calling
1615
        this method - it is assumed that the format of the branch
1616
        in a_bzrdir is correct.
1617
1618
        :param a_bzrdir: The bzrdir to set the branch reference for.
5147.4.6 by Jelmer Vernooij
consistency in names
1619
        :param name: Name of colocated branch to set, None for default
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1620
        :param to_branch: branch that the checkout is to reference
1621
        """
1622
        raise NotImplementedError(self.set_reference)
1623
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1624
    def get_format_string(self):
1625
        """Return the ASCII format string that identifies this format."""
1626
        raise NotImplementedError(self.get_format_string)
1627
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1628
    def get_format_description(self):
1629
        """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).
1630
        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
1631
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1632
    def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1633
        hooks = Branch.hooks['post_branch_init']
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1634
        if not hooks:
1635
            return
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1636
        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',
1637
        for hook in hooks:
1638
            hook(params)
1639
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1640
    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.
1641
                           repository=None, lock_type='metadir',
1642
                           set_format=True):
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1643
        """Initialize a branch in a bzrdir, with specified files
1644
1645
        :param a_bzrdir: The bzrdir to initialize the branch in
1646
        :param utf8_files: The files to create as a list of
1647
            (filename, content) tuples
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1648
        :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]
1649
        :param set_format: If True, set the format with
1650
            self.get_format_string.  (BzrBranch4 has its format set
1651
            elsewhere)
1652
        :return: a branch in this format
1653
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
1654
        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.
1655
        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]
1656
        lock_map = {
1657
            'metadir': ('lock', lockdir.LockDir),
1658
            'branch4': ('branch-lock', lockable_files.TransportLock),
1659
        }
1660
        lock_name, lock_class = lock_map[lock_type]
1661
        control_files = lockable_files.LockableFiles(branch_transport,
1662
            lock_name, lock_class)
1663
        control_files.create_lock()
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
1664
        try:
1665
            control_files.lock_write()
1666
        except errors.LockContention:
1667
            if lock_type != 'branch4':
1668
                raise
1669
            lock_taken = False
1670
        else:
1671
            lock_taken = True
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1672
        if set_format:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1673
            utf8_files += [('format', self.get_format_string())]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1674
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1675
            for (filename, content) in utf8_files:
1676
                branch_transport.put_bytes(
1677
                    filename, content,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
1678
                    mode=a_bzrdir._get_file_mode())
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1679
        finally:
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
1680
            if lock_taken:
1681
                control_files.unlock()
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
1682
        branch = self.open(a_bzrdir, name, _found=True,
1683
                found_repository=repository)
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1684
        self._run_post_branch_init_hooks(a_bzrdir, name, branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1685
        return branch
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1686
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
1687
    def initialize(self, a_bzrdir, name=None, repository=None):
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1688
        """Create a branch of this format in a_bzrdir.
1689
        
1690
        :param name: Name of the colocated branch to create.
1691
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1692
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1693
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
1694
    def is_supported(self):
1695
        """Is this format supported?
1696
1697
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1698
        Unsupported formats may not support initialization or committing or
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
1699
        some other features depending on the reason for not being supported.
1700
        """
1701
        return True
1702
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
1703
    def make_tags(self, branch):
1704
        """Create a tags object for branch.
1705
1706
        This method is on BranchFormat, because BranchFormats are reflected
1707
        over the wire via network_name(), whereas full Branch instances require
1708
        multiple VFS method calls to operate at all.
1709
1710
        The default implementation returns a disabled-tags instance.
1711
1712
        Note that it is normal for branch to be a RemoteBranch when using tags
1713
        on a RemoteBranch.
1714
        """
1715
        return DisabledTags(branch)
1716
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1717
    def network_name(self):
1718
        """A simple byte string uniquely identifying this format for RPC calls.
1719
1720
        MetaDir branch formats use their disk format string to identify the
1721
        repository over the wire. All in one formats such as bzr < 0.8, and
1722
        foreign formats like svn/git and hg should use some marker which is
1723
        unique and immutable.
1724
        """
1725
        raise NotImplementedError(self.network_name)
1726
5536.1.1 by Andrew Bennetts
Avoid reopening (and relocking) the same branches/repositories in ControlDir.sprout. Still a few rough edges, but the tests I've run are passing.
1727
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
1728
            found_repository=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1729
        """Return the branch object for a_bzrdir
1730
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1731
        :param a_bzrdir: A BzrDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
1732
        :param name: Name of colocated branch to open
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1733
        :param _found: a private parameter, do not use it. It is used to
1734
            indicate if format probing has already be done.
1735
        :param ignore_fallbacks: when set, no fallback branches will be opened
1736
            (if there are any).  Default is to open fallbacks.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1737
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1738
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1739
1740
    @classmethod
1741
    def register_format(klass, format):
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1742
        """Register a metadir format.
1743
        
1744
        See MetaDirBranchFormatFactory for the ability to register a format
1745
        without loading the code the format needs until it is actually used.
1746
        """
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1747
        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.
1748
        # 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
1749
        # registered as factories.
1750
        if isinstance(format, MetaDirBranchFormatFactory):
1751
            network_format_registry.register(format.get_format_string(), format)
1752
        else:
1753
            network_format_registry.register(format.get_format_string(),
1754
                format.__class__)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1755
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.
1756
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1757
    def set_default_format(klass, format):
1758
        klass._default_format = format
1759
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.
1760
    def supports_set_append_revisions_only(self):
1761
        """True if this format supports set_append_revisions_only."""
1762
        return False
1763
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1764
    def supports_stacking(self):
1765
        """True if this format records a stacked-on branch."""
1766
        return False
1767
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1768
    @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.
1769
    def unregister_format(klass, format):
1770
        del klass._formats[format.get_format_string()]
1771
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1772
    def __str__(self):
4032.3.2 by Robert Collins
Create and use a RPC call to create branches on bzr servers rather than using VFS calls.
1773
        return self.get_format_description().rstrip()
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1774
2220.2.10 by Martin Pool
(broken) start moving things to branches
1775
    def supports_tags(self):
1776
        """True if this format supports tags stored in the branch"""
1777
        return False  # by default
1778
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1779
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1780
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
1781
    """A factory for a BranchFormat object, permitting simple lazy registration.
1782
    
1783
    While none of the built in BranchFormats are lazy registered yet,
1784
    bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1785
    use it, and the bzr-loom plugin uses it as well (see
1786
    bzrlib.plugins.loom.formats).
1787
    """
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
1788
1789
    def __init__(self, format_string, module_name, member_name):
1790
        """Create a MetaDirBranchFormatFactory.
1791
1792
        :param format_string: The format string the format has.
1793
        :param module_name: Module to load the format class from.
1794
        :param member_name: Attribute name within the module for the format class.
1795
        """
1796
        registry._LazyObjectGetter.__init__(self, module_name, member_name)
1797
        self._format_string = format_string
1798
        
1799
    def get_format_string(self):
1800
        """See BranchFormat.get_format_string."""
1801
        return self._format_string
1802
1803
    def __call__(self):
1804
        """Used for network_format_registry support."""
1805
        return self.get_obj()()
1806
1807
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1808
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1809
    """A dictionary mapping hook name to a list of callables for branch hooks.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1810
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1811
    e.g. ['set_rh'] Is the list of items to be called when the
1812
    set_revision_history function is invoked.
1813
    """
1814
1815
    def __init__(self):
1816
        """Create the default hooks.
1817
1818
        These are all empty initially, because by default nothing should get
1819
        notified.
1820
        """
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1821
        Hooks.__init__(self)
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1822
        self.create_hook(HookPoint('set_rh',
1823
            "Invoked whenever the revision history has been set via "
1824
            "set_revision_history. The api signature is (branch, "
1825
            "revision_history), and the branch will be write-locked. "
1826
            "The set_rh hook can be expensive for bzr to trigger, a better "
1827
            "hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1828
        self.create_hook(HookPoint('open',
1829
            "Called with the Branch object that has been opened after a "
1830
            "branch is opened.", (1, 8), None))
1831
        self.create_hook(HookPoint('post_push',
1832
            "Called after a push operation completes. post_push is called "
4053.3.4 by Jelmer Vernooij
Update branch hooks documentation.
1833
            "with a bzrlib.branch.BranchPushResult object and only runs in the "
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1834
            "bzr client.", (0, 15), None))
1835
        self.create_hook(HookPoint('post_pull',
1836
            "Called after a pull operation completes. post_pull is called "
1837
            "with a bzrlib.branch.PullResult object and only runs in the "
1838
            "bzr client.", (0, 15), None))
1839
        self.create_hook(HookPoint('pre_commit',
5430.4.2 by Vincent Ladeuil
Fix typo in Branch.pre_commit HookPoint docstring.
1840
            "Called after a commit is calculated but before it is "
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1841
            "completed. pre_commit is called with (local, master, old_revno, "
1842
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1843
            "). old_revid is NULL_REVISION for the first commit to a branch, "
1844
            "tree_delta is a TreeDelta object describing changes from the "
1845
            "basis revision. hooks MUST NOT modify this delta. "
1846
            " future_tree is an in-memory tree obtained from "
1847
            "CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1848
            "tree.", (0,91), None))
1849
        self.create_hook(HookPoint('post_commit',
1850
            "Called in the bzr client after a commit has completed. "
1851
            "post_commit is called with (local, master, old_revno, old_revid, "
1852
            "new_revno, new_revid). old_revid is NULL_REVISION for the first "
1853
            "commit to a branch.", (0, 15), None))
1854
        self.create_hook(HookPoint('post_uncommit',
1855
            "Called in the bzr client after an uncommit completes. "
1856
            "post_uncommit is called with (local, master, old_revno, "
1857
            "old_revid, new_revno, new_revid) where local is the local branch "
1858
            "or None, master is the target branch, and an empty branch "
4031.3.2 by Matt Nordhoff
Merge bzr.dev, fixing conflicts.
1859
            "receives new_revno of 0, new_revid of None.", (0, 15), None))
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1860
        self.create_hook(HookPoint('pre_change_branch_tip',
1861
            "Called in bzr client and server before a change to the tip of a "
1862
            "branch is made. pre_change_branch_tip is called with a "
1863
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1864
            "commit, uncommit will all trigger this hook.", (1, 6), None))
1865
        self.create_hook(HookPoint('post_change_branch_tip',
1866
            "Called in bzr client and server after a change to the tip of a "
1867
            "branch is made. post_change_branch_tip is called with a "
1868
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1869
            "commit, uncommit will all trigger this hook.", (1, 4), None))
1870
        self.create_hook(HookPoint('transform_fallback_location',
1871
            "Called when a stacked branch is activating its fallback "
1872
            "locations. transform_fallback_location is called with (branch, "
1873
            "url), and should return a new url. Returning the same url "
1874
            "allows it to be used as-is, returning a different one can be "
1875
            "used to cause the branch to stack on a closer copy of that "
1876
            "fallback_location. Note that the branch cannot have history "
1877
            "accessing methods called on it during this hook because the "
1878
            "fallback locations have not been activated. When there are "
1879
            "multiple hooks installed for transform_fallback_location, "
1880
            "all are called with the url returned from the previous hook."
1881
            "The order is however undefined.", (1, 9), None))
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1882
        self.create_hook(HookPoint('automatic_tag_name',
5050.20.1 by Alexander Belchenko
trivial doc change to provide better docs in html format (space between two sentences needed)
1883
            "Called to determine an automatic tag name for a revision. "
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1884
            "automatic_tag_name is called with (branch, revision_id) and "
1885
            "should return a tag name or None if no tag name could be "
5086.4.9 by Jelmer Vernooij
Update documentation.
1886
            "determined. The first non-None tag name returned will be used.",
1887
            (2, 2), None))
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1888
        self.create_hook(HookPoint('post_branch_init',
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1889
            "Called after new branch initialization completes. "
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1890
            "post_branch_init is called with a "
1891
            "bzrlib.branch.BranchInitHookParams. "
1892
            "Note that init, branch and checkout (both heavyweight and "
1893
            "lightweight) will all trigger this hook.", (2, 2), None))
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1894
        self.create_hook(HookPoint('post_switch',
1895
            "Called after a checkout switches branch. "
1896
            "post_switch is called with a "
1897
            "bzrlib.branch.SwitchHookParams.", (2, 2), None))
5086.4.5 by Jelmer Vernooij
Make automatic_tag_name a hook on Branch.
1898
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1899
1900
1901
# install the default hooks into the Branch class.
1902
Branch.hooks = BranchHooks()
1903
1904
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1905
class ChangeBranchTipParams(object):
1906
    """Object holding parameters passed to *_change_branch_tip hooks.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1907
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1908
    There are 5 fields that hooks may wish to access:
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1909
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1910
    :ivar branch: the branch being changed
1911
    :ivar old_revno: revision number before the change
1912
    :ivar new_revno: revision number after the change
1913
    :ivar old_revid: revision id before the change
1914
    :ivar new_revid: revision id after the change
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1915
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1916
    The revid fields are strings. The revno fields are integers.
1917
    """
1918
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1919
    def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1920
        """Create a group of ChangeBranchTip parameters.
1921
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1922
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1923
        :param old_revno: Revision number before the change.
1924
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1925
        :param old_revid: Tip revision id before the change.
1926
        :param new_revid: Tip revision id after the change.
1927
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1928
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1929
        self.old_revno = old_revno
1930
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1931
        self.old_revid = old_revid
1932
        self.new_revid = new_revid
1933
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1934
    def __eq__(self, other):
1935
        return self.__dict__ == other.__dict__
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1936
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1937
    def __repr__(self):
1938
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1939
            self.__class__.__name__, self.branch,
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1940
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1941
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1942
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1943
class BranchInitHookParams(object):
1944
    """Object holding parameters passed to *_branch_init hooks.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1945
1946
    There are 4 fields that hooks may wish to access:
1947
1948
    :ivar format: the branch format
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1949
    :ivar bzrdir: the BzrDir where the branch will be/has been initialized
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1950
    :ivar name: name of colocated branch, if any (or None)
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1951
    :ivar branch: the branch created
1952
1953
    Note that for lightweight checkouts, the bzrdir and format fields refer to
1954
    the checkout, hence they are different from the corresponding fields in
1955
    branch, which refer to the original branch.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1956
    """
1957
1958
    def __init__(self, format, a_bzrdir, name, branch):
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
1959
        """Create a group of BranchInitHook parameters.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1960
1961
        :param format: the branch format
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1962
        :param a_bzrdir: the BzrDir where the branch will be/has been
1963
            initialized
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1964
        :param name: name of colocated branch, if any (or None)
5107.3.6 by Marco Pantaleoni
Documented behaviour of 'post_branch_init' for lightweight checkouts.
1965
        :param branch: the branch created
1966
1967
        Note that for lightweight checkouts, the bzrdir and format fields refer
1968
        to the checkout, hence they are different from the corresponding fields
1969
        in branch, which refer to the original branch.
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1970
        """
1971
        self.format = format
1972
        self.bzrdir = a_bzrdir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1973
        self.name = name
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1974
        self.branch = branch
1975
1976
    def __eq__(self, other):
1977
        return self.__dict__ == other.__dict__
1978
1979
    def __repr__(self):
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
1980
        return "<%s of %s>" % (self.__class__.__name__, self.branch)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1981
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1982
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1983
class SwitchHookParams(object):
1984
    """Object holding parameters passed to *_switch hooks.
1985
1986
    There are 4 fields that hooks may wish to access:
1987
1988
    :ivar control_dir: BzrDir of the checkout to change
1989
    :ivar to_branch: branch that the checkout is to reference
1990
    :ivar force: skip the check for local commits in a heavy checkout
1991
    :ivar revision_id: revision ID to switch to (or None)
1992
    """
1993
1994
    def __init__(self, control_dir, to_branch, force, revision_id):
1995
        """Create a group of SwitchHook parameters.
1996
1997
        :param control_dir: BzrDir of the checkout to change
1998
        :param to_branch: branch that the checkout is to reference
1999
        :param force: skip the check for local commits in a heavy checkout
2000
        :param revision_id: revision ID to switch to (or None)
2001
        """
2002
        self.control_dir = control_dir
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2003
        self.to_branch = to_branch
2004
        self.force = force
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
2005
        self.revision_id = revision_id
2006
2007
    def __eq__(self, other):
2008
        return self.__dict__ == other.__dict__
2009
2010
    def __repr__(self):
2011
        return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
2012
            self.control_dir, self.to_branch,
2013
            self.revision_id)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
2014
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2015
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2016
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
2017
    """Bzr branch format 4.
2018
2019
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2020
     - 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.
2021
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2022
    """
2023
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
2024
    def get_format_description(self):
2025
        """See BranchFormat.get_format_description()."""
2026
        return "Branch format 4"
2027
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.
2028
    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.
2029
        """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.
2030
        if repository is not None:
2031
            raise NotImplementedError(
2032
                "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.
2033
        utf8_files = [('revision-history', ''),
2034
                      ('branch-name', ''),
2035
                      ]
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2036
        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]
2037
                                       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.
2038
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2039
    def __init__(self):
2040
        super(BzrBranchFormat4, self).__init__()
2041
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
2042
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2043
    def network_name(self):
2044
        """The network name for this format is the control dirs disk label."""
2045
        return self._matchingbzrdir.get_format_string()
2046
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.
2047
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2048
            found_repository=None):
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2049
        """See BranchFormat.open()."""
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2050
        if not _found:
2051
            # we are being called directly and must probe.
2052
            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.
2053
        if found_repository is None:
2054
            found_repository = a_bzrdir.open_repository()
5582.4.2 by Jelmer Vernooij
Split out split-out specific code (in preparation of move to bzrlib.plugins.weave_fmt).
2055
        return BzrBranchPreSplitOut(_format=self,
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
2056
                         _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.
2057
                         a_bzrdir=a_bzrdir,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2058
                         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.
2059
                         _repository=found_repository)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2060
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
2061
    def __str__(self):
2062
        return "Bazaar-NG branch format 4"
2063
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2064
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2065
class BranchFormatMetadir(BranchFormat):
2066
    """Common logic for meta-dir based branch formats."""
2067
2068
    def _branch_class(self):
2069
        """What class to instantiate on open calls."""
2070
        raise NotImplementedError(self._branch_class)
2071
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2072
    def network_name(self):
2073
        """A simple byte string uniquely identifying this format for RPC calls.
2074
2075
        Metadir branch formats use their format string.
2076
        """
2077
        return self.get_format_string()
2078
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.
2079
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2080
            found_repository=None):
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2081
        """See BranchFormat.open()."""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2082
        if not _found:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2083
            format = BranchFormat.find_format(a_bzrdir, name=name)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2084
            if format.__class__ != self.__class__:
2085
                raise AssertionError("wrong format %r found for %r" %
2086
                    (format, self))
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2087
        transport = a_bzrdir.get_branch_transport(None, name=name)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2088
        try:
2089
            control_files = lockable_files.LockableFiles(transport, 'lock',
2090
                                                         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.
2091
            if found_repository is None:
2092
                found_repository = a_bzrdir.find_repository()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2093
            return self._branch_class()(_format=self,
2094
                              _control_files=control_files,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2095
                              name=name,
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2096
                              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.
2097
                              _repository=found_repository,
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2098
                              ignore_fallbacks=ignore_fallbacks)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2099
        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)
2100
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2101
2102
    def __init__(self):
2103
        super(BranchFormatMetadir, self).__init__()
2104
        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.
2105
        self._matchingbzrdir.set_branch_format(self)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2106
2107
    def supports_tags(self):
2108
        return True
2109
2110
2111
class BzrBranchFormat5(BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2112
    """Bzr branch format 5.
2113
2114
    This format has:
2115
     - a revision-history file.
2116
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2117
     - a lock dir guarding the branch itself
2118
     - 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.
2119
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2120
2121
    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.
2122
    """
2123
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2124
    def _branch_class(self):
2125
        return BzrBranch5
2126
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
2127
    def get_format_string(self):
2128
        """See BranchFormat.get_format_string()."""
2129
        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
2130
2131
    def get_format_description(self):
2132
        """See BranchFormat.get_format_description()."""
2133
        return "Branch format 5"
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2134
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.
2135
    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.
2136
        """Create a branch of this format in a_bzrdir."""
2137
        utf8_files = [('revision-history', ''),
2138
                      ('branch-name', ''),
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
        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.
2141
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2142
    def supports_tags(self):
2143
        return False
2144
2145
2146
class BzrBranchFormat6(BranchFormatMetadir):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2147
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2148
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
2149
    Unlike previous formats, this has no explicit revision history. Instead,
2150
    this just stores the last-revision, and the left-hand history leading
2151
    up to there is the history.
2152
2153
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
2154
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
2155
    """
2156
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2157
    def _branch_class(self):
2158
        return BzrBranch6
2159
2230.3.1 by Aaron Bentley
Get branch6 creation working
2160
    def get_format_string(self):
2161
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
2162
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
2163
2164
    def get_format_description(self):
2165
        """See BranchFormat.get_format_description()."""
2166
        return "Branch format 6"
2167
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.
2168
    def initialize(self, a_bzrdir, name=None, repository=None):
2230.3.1 by Aaron Bentley
Get branch6 creation working
2169
        """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
2170
        utf8_files = [('last-revision', '0 null:\n'),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
2171
                      ('branch.conf', ''),
2172
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
2173
                      ]
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.
2174
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2175
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.
2176
    def make_tags(self, branch):
2177
        """See bzrlib.branch.BranchFormat.make_tags()."""
2178
        return BasicTags(branch)
2179
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.
2180
    def supports_set_append_revisions_only(self):
2181
        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.
2182
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2183
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2184
class BzrBranchFormat8(BranchFormatMetadir):
2185
    """Metadir format supporting storing locations of subtree branches."""
2186
2187
    def _branch_class(self):
2188
        return BzrBranch8
2189
2190
    def get_format_string(self):
2191
        """See BranchFormat.get_format_string()."""
2192
        return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2193
2194
    def get_format_description(self):
2195
        """See BranchFormat.get_format_description()."""
2196
        return "Branch format 8"
2197
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.
2198
    def initialize(self, a_bzrdir, name=None, repository=None):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2199
        """Create a branch of this format in a_bzrdir."""
2200
        utf8_files = [('last-revision', '0 null:\n'),
2201
                      ('branch.conf', ''),
2202
                      ('tags', ''),
2203
                      ('references', '')
2204
                      ]
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.
2205
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2206
2207
    def __init__(self):
2208
        super(BzrBranchFormat8, self).__init__()
2209
        self._matchingbzrdir.repository_format = \
2210
            RepositoryFormatKnitPack5RichRoot()
2211
2212
    def make_tags(self, branch):
2213
        """See bzrlib.branch.BranchFormat.make_tags()."""
2214
        return BasicTags(branch)
2215
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.
2216
    def supports_set_append_revisions_only(self):
2217
        return True
2218
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2219
    def supports_stacking(self):
2220
        return True
2221
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
2222
    supports_reference_locations = True
2223
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2224
2225
class BzrBranchFormat7(BzrBranchFormat8):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2226
    """Branch format with last-revision, tags, and a stacked location pointer.
2227
2228
    The stacked location pointer is passed down to the repository and requires
2229
    a repository format with supports_external_lookups = True.
2230
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
2231
    This format was introduced in bzr 1.6.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2232
    """
2233
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.
2234
    def initialize(self, a_bzrdir, name=None, repository=None):
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2235
        """Create a branch of this format in a_bzrdir."""
2236
        utf8_files = [('last-revision', '0 null:\n'),
2237
                      ('branch.conf', ''),
2238
                      ('tags', ''),
2239
                      ]
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.
2240
        return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
2241
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2242
    def _branch_class(self):
2243
        return BzrBranch7
2244
2245
    def get_format_string(self):
2246
        """See BranchFormat.get_format_string()."""
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
2247
        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2248
2249
    def get_format_description(self):
2250
        """See BranchFormat.get_format_description()."""
2251
        return "Branch format 7"
2252
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.
2253
    def supports_set_append_revisions_only(self):
2254
        return True
2255
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
2256
    supports_reference_locations = False
2257
2230.3.1 by Aaron Bentley
Get branch6 creation working
2258
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
2259
class BranchReferenceFormat(BranchFormat):
2260
    """Bzr branch reference format.
2261
2262
    Branch references are used in implementing checkouts, they
2263
    act as an alias to the real branch which is at some other url.
2264
2265
    This format has:
2266
     - A location file
2267
     - a format string
2268
    """
2269
2270
    def get_format_string(self):
2271
        """See BranchFormat.get_format_string()."""
2272
        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
2273
2274
    def get_format_description(self):
2275
        """See BranchFormat.get_format_description()."""
2276
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2277
5147.4.6 by Jelmer Vernooij
consistency in names
2278
    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.
2279
        """See BranchFormat.get_reference()."""
5147.4.6 by Jelmer Vernooij
consistency in names
2280
        transport = a_bzrdir.get_branch_transport(None, name=name)
4708.2.1 by Martin
Ensure all files opened by bazaar proper are explicitly closed
2281
        return transport.get_bytes('location')
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
2282
5147.4.6 by Jelmer Vernooij
consistency in names
2283
    def set_reference(self, a_bzrdir, name, to_branch):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
2284
        """See BranchFormat.set_reference()."""
5147.4.6 by Jelmer Vernooij
consistency in names
2285
        transport = a_bzrdir.get_branch_transport(None, name=name)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
2286
        location = transport.put_bytes('location', to_branch.base)
2287
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.
2288
    def initialize(self, a_bzrdir, name=None, target_branch=None,
2289
            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.
2290
        """Create a branch of this format in a_bzrdir."""
2291
        if target_branch is None:
2292
            # this format does not implement branch itself, thus the implicit
2293
            # creation contract must see it as uninitializable
2294
            raise errors.UninitializableFormat(self)
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2295
        mutter('creating branch reference in %s', a_bzrdir.user_url)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2296
        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
2297
        branch_transport.put_bytes('location',
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2298
            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
2299
        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',
2300
        branch = self.open(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2301
            a_bzrdir, name, _found=True,
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2302
            possible_transports=[target_branch.bzrdir.root_transport])
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
2303
        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',
2304
        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.
2305
2306
    def __init__(self):
2307
        super(BranchReferenceFormat, self).__init__()
2308
        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.
2309
        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.
2310
2311
    def _make_reference_clone_function(format, a_branch):
2312
        """Create a clone() routine for a branch dynamically."""
4050.1.3 by Robert Collins
Add missed new parameter for branch reference cloning.
2313
        def clone(to_bzrdir, revision_id=None,
2314
            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.
2315
            """See Branch.clone()."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2316
            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.
2317
            # cannot obey revision_id limits when cloning a reference ...
2318
            # FIXME RBC 20060210 either nuke revision_id for clone, or
2319
            # emit some sort of warning/error to the caller ?!
2320
        return clone
2321
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2322
    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.
2323
             possible_transports=None, ignore_fallbacks=False,
2324
             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.
2325
        """Return the branch that the branch reference in a_bzrdir points at.
2326
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2327
        :param a_bzrdir: A BzrDir that contains a branch.
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2328
        :param name: Name of colocated branch to open, if any
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
2329
        :param _found: a private parameter, do not use it. It is used to
2330
            indicate if format probing has already be done.
2331
        :param ignore_fallbacks: when set, no fallback branches will be opened
2332
            (if there are any).  Default is to open fallbacks.
2333
        :param location: The location of the referenced branch.  If
2334
            unspecified, this will be determined from the branch reference in
2335
            a_bzrdir.
2336
        :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.
2337
        """
2338
        if not _found:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2339
            format = BranchFormat.find_format(a_bzrdir, name=name)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2340
            if format.__class__ != self.__class__:
2341
                raise AssertionError("wrong format %r found for %r" %
2342
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
2343
        if location is None:
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
2344
            location = self.get_reference(a_bzrdir, name)
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
2345
        real_bzrdir = bzrdir.BzrDir.open(
2346
            location, possible_transports=possible_transports)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
2347
        result = real_bzrdir.open_branch(name=name, 
2348
            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.
2349
        # this changes the behaviour of result.clone to create a new reference
2350
        # rather than a copy of the content of the branch.
2351
        # I did not use a proxy object because that needs much more extensive
2352
        # testing, and we are only changing one behaviour at the moment.
2353
        # If we decide to alter more behaviours - i.e. the implicit nickname
2354
        # then this should be refactored to introduce a tested proxy branch
2355
        # and a subclass of that for use in overriding clone() and ....
2356
        # - RBC 20060210
2357
        result.clone = self._make_reference_clone_function(result)
2358
        return result
2359
2360
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2361
network_format_registry = registry.FormatRegistry()
2362
"""Registry of formats indexed by their network name.
2363
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
2364
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.
2365
referring to formats with smart server operations. See
2366
BranchFormat.network_name() for more detail.
2367
"""
2368
2369
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2370
# formats which have no format string are not discoverable
2371
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
2372
__format5 = BzrBranchFormat5()
2373
__format6 = BzrBranchFormat6()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2374
__format7 = BzrBranchFormat7()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2375
__format8 = BzrBranchFormat8()
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
2376
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.
2377
BranchFormat.register_format(BranchReferenceFormat())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
2378
BranchFormat.register_format(__format6)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2379
BranchFormat.register_format(__format7)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2380
BranchFormat.register_format(__format8)
4599.4.3 by Robert Collins
Change the default branch format to 7, matching the default metadir description for 2a.
2381
BranchFormat.set_default_format(__format7)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2382
_legacy_formats = [BzrBranchFormat4(),
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
2383
    ]
2384
network_format_registry.register(
4075.2.1 by Robert Collins
Audit and make sure we are registering network_name's as factories, not instances.
2385
    _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.
2386
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
2387
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2388
class BranchWriteLockResult(LogicalLockResult):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2389
    """The result of write locking a branch.
2390
2391
    :ivar branch_token: The token obtained from the underlying branch lock, or
2392
        None.
2393
    :ivar unlock: A callable which will unlock the lock.
2394
    """
2395
2396
    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.
2397
        LogicalLockResult.__init__(self, unlock)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2398
        self.branch_token = branch_token
2399
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2400
    def __repr__(self):
5200.3.5 by Robert Collins
Add __str__ to the new helper classes.
2401
        return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2402
            self.unlock)
2403
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2404
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2405
class BzrBranch(Branch, _RelockDebugMixin):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
2406
    """A branch stored in the actual filesystem.
2407
2408
    Note that it's "local" in the context of the filesystem; it doesn't
2409
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
2410
    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
2411
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2412
    :ivar _transport: Transport for file operations on this branch's
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2413
        control files, typically pointing to the .bzr/branch directory.
2414
    :ivar repository: Repository for this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2415
    :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
2416
        containing the .bzr directory.
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2417
    :ivar name: Optional colocated branch name as it exists in the control
2418
        directory.
1 by mbp at sourcefrog
import from baz patch-364
2419
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2420
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
2421
    def __init__(self, _format=None,
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2422
                 _control_files=None, a_bzrdir=None, name=None,
2423
                 _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)
2424
        """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.
2425
        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)
2426
            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.
2427
        else:
2428
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2429
        self._base = self.bzrdir.transport.clone('..').base
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2430
        self.name = name
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2431
        # XXX: We should be able to just do
2432
        #   self.base = self.bzrdir.root_transport.base
2433
        # but this does not quite work yet -- mbp 20080522
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2434
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
2435
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2436
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
2437
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2438
        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.
2439
        self.repository = _repository
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2440
        Branch.__init__(self)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
2441
1 by mbp at sourcefrog
import from baz patch-364
2442
    def __str__(self):
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2443
        if self.name is None:
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2444
            return '%s(%s)' % (self.__class__.__name__, self.user_url)
5085.1.1 by Jelmer Vernooij
Let branches know about their colocated name.
2445
        else:
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2446
            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2447
                self.name)
1 by mbp at sourcefrog
import from baz patch-364
2448
2449
    __repr__ = __str__
2450
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2451
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2452
        """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
2453
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2454
1442.1.5 by Robert Collins
Give branch.base a docstring.
2455
    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,
2456
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2457
    def _get_config(self):
2458
        return TransportConfig(self._transport, 'branch.conf')
2459
1694.2.6 by Martin Pool
[merge] bzr.dev
2460
    def is_locked(self):
2461
        return self.control_files.is_locked()
2462
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).
2463
    def lock_write(self, token=None):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2464
        """Lock the branch for write operations.
2465
2466
        :param token: A token to permit reacquiring a previously held and
2467
            preserved lock.
2468
        :return: A BranchWriteLockResult.
2469
        """
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2470
        if not self.is_locked():
2471
            self._note_lock('w')
4288.1.12 by Robert Collins
Review feedback.
2472
        # 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.
2473
        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).
2474
        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
2475
            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.
2476
            self.repository.lock_write()
2477
            took_lock = True
2478
        else:
2479
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2480
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2481
            return BranchWriteLockResult(self.unlock,
2482
                self.control_files.lock_write(token=token))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2483
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2484
            if took_lock:
2485
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2486
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2487
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
2488
    def lock_read(self):
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2489
        """Lock the branch for read operations.
2490
5200.3.6 by Robert Collins
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.
2491
        :return: A bzrlib.lock.LogicalLockResult.
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2492
        """
4731.1.2 by Andrew Bennetts
Refactor to reduce duplication.
2493
        if not self.is_locked():
2494
            self._note_lock('r')
4288.1.12 by Robert Collins
Review feedback.
2495
        # 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.
2496
        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).
2497
        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
2498
            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.
2499
            self.repository.lock_read()
2500
            took_lock = True
2501
        else:
2502
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2503
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
2504
            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.
2505
            return LogicalLockResult(self.unlock)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2506
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2507
            if took_lock:
2508
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2509
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2510
4634.85.11 by Andrew Bennetts
Suppress most errors from Branch.unlock too.
2511
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2512
    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).
2513
        try:
2514
            self.control_files.unlock()
2515
        finally:
4288.1.12 by Robert Collins
Review feedback.
2516
            # 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).
2517
            repo_control = getattr(self.repository, 'control_files', None)
2518
            if (self.control_files == repo_control or
2519
                not self.control_files.is_locked()):
2520
                self.repository.unlock()
2521
            if not self.control_files.is_locked():
2522
                # we just released the lock
2523
                self._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2524
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
2525
    def peek_lock_mode(self):
2526
        if self.control_files._lock_count == 0:
2527
            return None
2528
        else:
2529
            return self.control_files._lock_mode
2530
1694.2.6 by Martin Pool
[merge] bzr.dev
2531
    def get_physical_lock_status(self):
2532
        return self.control_files.get_physical_lock_status()
2533
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
2534
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2535
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2536
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2537
        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.
2538
2230.3.49 by Aaron Bentley
Fix cache updating
2539
    def _write_revision_history(self, history):
2540
        """Factored out of set_revision_history.
2541
2542
        This performs the actual writing to disk.
2543
        It is intended to be called by BzrBranch5.set_revision_history."""
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2544
        self._transport.put_bytes(
2545
            'revision-history', '\n'.join(history),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2546
            mode=self.bzrdir._get_file_mode())
2230.3.49 by Aaron Bentley
Fix cache updating
2547
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
2548
    @needs_write_lock
2549
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2550
        """See Branch.set_revision_history."""
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
2551
        if 'evil' in debug.debug_flags:
2552
            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.
2553
        check_not_reserved_id = _mod_revision.check_not_reserved_id
2554
        for rev_id in rev_history:
2555
            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().
2556
        if Branch.hooks['post_change_branch_tip']:
2557
            # Don't calculate the last_revision_info() if there are no hooks
2558
            # that will use it.
2559
            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.
2560
        if len(rev_history) == 0:
2561
            revid = _mod_revision.NULL_REVISION
2562
        else:
2563
            revid = rev_history[-1]
2564
        self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2230.3.49 by Aaron Bentley
Fix cache updating
2565
        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.
2566
        self._clear_cached_state()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
2567
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
2568
        for hook in Branch.hooks['set_rh']:
2569
            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().
2570
        if Branch.hooks['post_change_branch_tip']:
2571
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
233 by mbp at sourcefrog
- more output from test.sh
2572
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.
2573
    def _synchronize_history(self, destination, revision_id):
2574
        """Synchronize last revision and revision history between branches.
2575
2576
        This version is most efficient when the destination is also a
2577
        BzrBranch5, but works for BzrBranch6 as long as the revision
2578
        history is the true lefthand parent history, and all of the revisions
2579
        are in the destination's repository.  If not, set_revision_history
2580
        will fail.
2581
2582
        :param destination: The branch to copy the history into
2583
        :param revision_id: The revision-id to truncate history at.  May
2584
          be None to copy complete history.
2585
        """
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.
2586
        if not isinstance(destination._format, BzrBranchFormat5):
2587
            super(BzrBranch, self)._synchronize_history(
2588
                destination, revision_id)
2589
            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.
2590
        if revision_id == _mod_revision.NULL_REVISION:
2591
            new_history = []
2592
        else:
2593
            new_history = self.revision_history()
2594
        if revision_id is not None and new_history != []:
2595
            try:
2596
                new_history = new_history[:new_history.index(revision_id) + 1]
2597
            except ValueError:
2598
                rev = self.repository.get_revision(revision_id)
2599
                new_history = rev.get_history(self.repository)[1:]
2600
        destination.set_revision_history(new_history)
2601
2230.3.5 by Aaron Bentley
implement set_last revision and clone
2602
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2603
    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
2604
        """Set the last revision of this branch.
2605
2606
        The caller is responsible for checking that the revno is correct
2607
        for this revision id.
2608
2609
        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
2610
        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
2611
        configured to check constraints on history, in which case this may not
2612
        be permitted.
2613
        """
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
2614
        revision_id = _mod_revision.ensure_null(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2615
        # this old format stores the full history, but this api doesn't
2616
        # provide it, so we must generate, and might as well check it's
2617
        # correct
2697.2.5 by Martin Pool
Kill off append_revision
2618
        history = self._lefthand_history(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2619
        if len(history) != revno:
2620
            raise AssertionError('%d != %d' % (len(history), revno))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2621
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
2622
2230.4.1 by Aaron Bentley
Get log as fast branch5
2623
    def _gen_revision_history(self):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2624
        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.
2625
        if history[-1:] == ['']:
2626
            # There shouldn't be a trailing newline, but just in case.
2627
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
2628
        return history
2629
2230.3.2 by Aaron Bentley
Get all branch tests passing
2630
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2631
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
2632
        other_branch=None):
2633
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2634
2230.3.2 by Aaron Bentley
Get all branch tests passing
2635
        :param revision_id: the new tip to use.
2636
        :param last_rev: The previous last_revision. If not None, then this
2637
            must be a ancestory of revision_id, or DivergedBranches is raised.
2638
        :param other_branch: The other branch that DivergedBranches should
2639
            raise with respect to.
2640
        """
2641
        self.set_revision_history(self._lefthand_history(revision_id,
2642
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
2643
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2644
    def basis_tree(self):
2645
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2646
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2647
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2648
    def _get_parent_location(self):
2649
        _locs = ['parent', 'pull', 'x-pull']
2650
        for l in _locs:
2651
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2652
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
2653
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2654
                pass
2655
        return None
2656
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
2657
    def _basic_push(self, target, overwrite, stop_revision):
2658
        """Basic implementation of push without bound branches or hooks.
2659
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2660
        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
2661
        """
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
2662
        result = BranchPushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2663
        result.source_branch = self
2664
        result.target_branch = target
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
2665
        result.old_revno, result.old_revid = target.last_revision_info()
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
2666
        self.update_references(target)
5611.2.1 by Jelmer Vernooij
Fix 'bzr push --overwrite -rOLD_MAINLINE_REV'.
2667
        if result.old_revid != stop_revision:
3703.3.1 by Andrew Bennetts
Skip unnecessary work in BzrBranch._basic_push.
2668
            # We assume that during 'push' this repository is closer than
2669
            # the target.
2670
            graph = self.repository.get_graph(target.repository)
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
2671
            target.update_revisions(self, stop_revision,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2672
                overwrite=overwrite, graph=graph)
3703.3.5 by Andrew Bennetts
Allow subclasses to control if _basic_push can skip tag merging.
2673
        if self._push_should_merge_tags():
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
2674
            result.tag_conflicts = self.tags.merge_to(target.tags,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2675
                overwrite)
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
2676
        result.new_revno, result.new_revid = target.last_revision_info()
2677
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
2678
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2679
    def get_stacked_on_url(self):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2680
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2681
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2682
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2683
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
2684
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
2685
            'push_location', location,
2686
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2687
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2688
    def _set_parent_location(self, url):
2689
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2690
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2691
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2692
            self._transport.put_bytes('parent', url + '\n',
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2693
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
2694
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2695
5582.4.2 by Jelmer Vernooij
Split out split-out specific code (in preparation of move to bzrlib.plugins.weave_fmt).
2696
class BzrBranchPreSplitOut(BzrBranch):
2697
2698
    def _get_checkout_format(self):
2699
        """Return the most suitable metadir for a checkout of this branch.
2700
        Weaves are used if this branch's repository uses weaves.
2701
        """
2702
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
2703
        from bzrlib.bzrdir import BzrDirMetaFormat1
2704
        format = BzrDirMetaFormat1()
2705
        format.repository_format = RepositoryFormat7()
2706
        return format
2707
2708
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2709
class BzrBranch5(BzrBranch):
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2710
    """A format 5 branch. This supports new features over plain branches.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2711
2712
    It has support for a master_branch which is the data for bound branches.
2713
    """
2714
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2715
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2716
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
2717
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2718
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2719
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2720
2721
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2722
    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
2723
        """Return the branch we are bound to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2724
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2725
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2726
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2727
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2728
        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.
2729
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2730
        # 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
2731
        """
2732
        bound_loc = self.get_bound_location()
2733
        if not bound_loc:
2734
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2735
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2736
            return Branch.open(bound_loc,
2737
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2738
        except (errors.NotBranchError, errors.ConnectionError), e:
2739
            raise errors.BoundBranchConnectionFailure(
2740
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2741
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2742
    @needs_write_lock
2743
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
2744
        """Set the target where this branch is bound to.
2745
2746
        :param location: URL to the target branch
2747
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
2748
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2749
            self._transport.put_bytes('bound', location+'\n',
2750
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
2751
        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.
2752
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2753
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
2754
            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.
2755
                return False
2756
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2757
2758
    @needs_write_lock
2759
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
2760
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2761
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
2762
        This does not push or pull data between the branches, though it does
2763
        check for divergence to raise an error when the branches are not
2764
        either the same, or one a prefix of the other. That behaviour may not
2765
        be useful, so that check may be removed in future.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2766
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2767
        :param other: The branch to bind to
2768
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
2769
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2770
        # TODO: jam 20051230 Consider checking if the target is bound
2771
        #       It is debatable whether you should be able to bind to
2772
        #       a branch which is itself bound.
2773
        #       Committing is obviously forbidden,
2774
        #       but binding itself may not be.
2775
        #       Since we *have* to check at commit time, we don't
2776
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
2777
2778
        # we want to raise diverged if:
2779
        # last_rev is not in the other_last_rev history, AND
2780
        # other_last_rev is not in our history, and do it without pulling
2781
        # history around
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2782
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2783
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
2784
    @needs_write_lock
2785
    def unbind(self):
2786
        """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.
2787
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2788
1587.1.10 by Robert Collins
update updates working tree and branch together.
2789
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2790
    def update(self, possible_transports=None):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2791
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
2792
2793
        :return: None or the last_revision that was pivoted out during the
2794
                 update.
2795
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2796
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
2797
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2798
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
2799
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2800
            if self.repository.get_graph().is_ancestor(old_tip,
2801
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
2802
                return None
2803
            return old_tip
2804
        return None
2805
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
2806
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2807
class BzrBranch8(BzrBranch5):
2808
    """A branch that stores tree-reference locations."""
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2809
2810
    def _open_hook(self):
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2811
        if self._ignore_fallbacks:
2812
            return
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2813
        try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2814
            url = self.get_stacked_on_url()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2815
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2816
            errors.UnstackableBranchFormat):
2817
            pass
2818
        else:
3770.2.1 by Michael Hudson
test and feature
2819
            for hook in Branch.hooks['transform_fallback_location']:
2820
                url = hook(self, url)
3770.2.3 by Michael Hudson
check for None being returned for a hook
2821
                if url is None:
2822
                    hook_name = Branch.hooks.get_hook_name(hook)
2823
                    raise AssertionError(
2824
                        "'transform_fallback_location' hook %s returned "
2825
                        "None, not a URL." % hook_name)
4379.2.2 by John Arbash Meinel
Change the Repository.add_fallback_repository() contract slightly.
2826
            self._activate_fallback_location(url)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2827
4160.2.8 by Andrew Bennetts
Slightly less messy BzrBranch7.__init__.
2828
    def __init__(self, *args, **kwargs):
2829
        self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2830
        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.
2831
        self._last_revision_info_cache = None
4273.1.15 by Aaron Bentley
Add reference_info caching.
2832
        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.
2833
2834
    def _clear_cached_state(self):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2835
        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.
2836
        self._last_revision_info_cache = None
4273.1.15 by Aaron Bentley
Add reference_info caching.
2837
        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.
2838
3298.2.10 by Aaron Bentley
Refactor partial history code
2839
    def _last_revision_info(self):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2840
        revision_string = self._transport.get_bytes('last-revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
2841
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2842
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2843
        revno = int(revno)
2844
        return revno, revision_id
2845
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2846
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
2847
        """Simply write out the revision id, with no checks.
2848
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2849
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
2850
2851
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2852
        Intended to be called by set_last_revision_info and
2853
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
2854
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2855
        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
2856
        out_string = '%d %s\n' % (revno, revision_id)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2857
        self._transport.put_bytes('last-revision', out_string,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2858
            mode=self.bzrdir._get_file_mode())
2230.3.2 by Aaron Bentley
Get all branch tests passing
2859
2230.3.49 by Aaron Bentley
Fix cache updating
2860
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2861
    def set_last_revision_info(self, revno, revision_id):
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
2862
        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.
2863
        old_revno, old_revid = self.last_revision_info()
2230.3.49 by Aaron Bentley
Fix cache updating
2864
        if self._get_append_revisions_only():
2865
            self._check_history_violation(revision_id)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
2866
        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
2867
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
2868
        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.
2869
        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.
2870
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.3.49 by Aaron Bentley
Fix cache updating
2871
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.
2872
    def _synchronize_history(self, destination, revision_id):
2873
        """Synchronize last revision and revision history between branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2874
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.
2875
        :see: Branch._synchronize_history
2876
        """
2877
        # XXX: The base Branch has a fast implementation of this method based
2878
        # on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2879
        # that uses set_revision_history.  This class inherits from BzrBranch5,
2880
        # but wants the fast implementation, so it calls
2881
        # Branch._synchronize_history directly.
2882
        Branch._synchronize_history(self, destination, revision_id)
2883
2230.3.32 by Aaron Bentley
Implement strict history policy
2884
    def _check_history_violation(self, revision_id):
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2885
        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
2886
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
2887
            return
2888
        if last_revision not in self._lefthand_history(revision_id):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2889
            raise errors.AppendRevisionsOnlyViolation(self.user_url)
2230.3.32 by Aaron Bentley
Implement strict history policy
2890
2230.4.1 by Aaron Bentley
Get log as fast branch5
2891
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2892
        """Generate the revision history from last revision
2893
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2894
        last_revno, last_revision = self.last_revision_info()
2895
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2896
        return list(reversed(self._partial_revision_history_cache))
2897
2230.3.49 by Aaron Bentley
Fix cache updating
2898
    def _write_revision_history(self, history):
2899
        """Factored out of set_revision_history.
2900
2901
        This performs the actual writing to disk, with format-specific checks.
2902
        It is intended to be called by BzrBranch5.set_revision_history.
2903
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
2904
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
2905
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
2906
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2907
            if history != self._lefthand_history(history[-1]):
2908
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
2909
            last_revision = history[-1]
2910
        if self._get_append_revisions_only():
2911
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2912
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2913
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2914
    @needs_write_lock
2915
    def _set_parent_location(self, url):
2916
        """Set the parent branch"""
2917
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2918
2919
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2920
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2921
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2922
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2923
4273.1.15 by Aaron Bentley
Add reference_info caching.
2924
    @needs_write_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2925
    def _set_all_reference_info(self, info_dict):
2926
        """Replace all reference info stored in a branch.
2927
2928
        :param info_dict: A dict of {file_id: (tree_path, branch_location)}
2929
        """
2930
        s = StringIO()
2931
        writer = rio.RioWriter(s)
2932
        for key, (tree_path, branch_location) in info_dict.iteritems():
2933
            stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2934
                                branch_location=branch_location)
2935
            writer.write_stanza(stanza)
2936
        self._transport.put_bytes('references', s.getvalue())
4273.1.15 by Aaron Bentley
Add reference_info caching.
2937
        self._reference_info = info_dict
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2938
4273.1.15 by Aaron Bentley
Add reference_info caching.
2939
    @needs_read_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2940
    def _get_all_reference_info(self):
2941
        """Return all the reference info stored in a branch.
2942
2943
        :return: A dict of {file_id: (tree_path, branch_location)}
2944
        """
4273.1.15 by Aaron Bentley
Add reference_info caching.
2945
        if self._reference_info is not None:
2946
            return self._reference_info
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2947
        rio_file = self._transport.get('references')
2948
        try:
2949
            stanzas = rio.read_stanzas(rio_file)
2950
            info_dict = dict((s['file_id'], (s['tree_path'],
2951
                             s['branch_location'])) for s in stanzas)
2952
        finally:
2953
            rio_file.close()
4273.1.15 by Aaron Bentley
Add reference_info caching.
2954
        self._reference_info = info_dict
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2955
        return info_dict
2956
2957
    def set_reference_info(self, file_id, tree_path, branch_location):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2958
        """Set the branch location to use for a tree reference.
2959
2960
        :param file_id: The file-id of the tree reference.
2961
        :param tree_path: The path of the tree reference in the tree.
2962
        :param branch_location: The location of the branch to retrieve tree
2963
            references from.
2964
        """
2965
        info_dict = self._get_all_reference_info()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2966
        info_dict[file_id] = (tree_path, branch_location)
2967
        if None in (tree_path, branch_location):
2968
            if tree_path is not None:
2969
                raise ValueError('tree_path must be None when branch_location'
2970
                                 ' is None.')
2971
            if branch_location is not None:
2972
                raise ValueError('branch_location must be None when tree_path'
2973
                                 ' is None.')
2974
            del info_dict[file_id]
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2975
        self._set_all_reference_info(info_dict)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2976
2977
    def get_reference_info(self, file_id):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2978
        """Get the tree_path and branch_location for a tree reference.
2979
2980
        :return: a tuple of (tree_path, branch_location)
2981
        """
2982
        return self._get_all_reference_info().get(file_id, (None, None))
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2983
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2984
    def reference_parent(self, file_id, path, possible_transports=None):
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2985
        """Return the parent branch for a tree-reference file_id.
2986
2987
        :param file_id: The file_id of the tree reference
2988
        :param path: The path of the file_id in the tree
2989
        :return: A branch associated with the file_id
2990
        """
2991
        branch_location = self.get_reference_info(file_id)[1]
2992
        if branch_location is None:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2993
            return Branch.reference_parent(self, file_id, path,
2994
                                           possible_transports)
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
2995
        branch_location = urlutils.join(self.user_url, branch_location)
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2996
        return Branch.open(branch_location,
2997
                           possible_transports=possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2998
2230.3.3 by Aaron Bentley
Add more config testing
2999
    def set_push_location(self, location):
3000
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
3001
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
3002
3003
    def set_bound_location(self, location):
3004
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
3005
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3006
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
3007
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3008
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
3009
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3010
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
3011
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3012
                return True
3013
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
3014
            self._set_config_location('bound_location', location,
3015
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
3016
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3017
        return True
3018
3019
    def _get_bound_location(self, bound):
3020
        """Return the bound location in the config file.
3021
3022
        Return None if the bound parameter does not match"""
3023
        config = self.get_config()
3024
        config_bound = (config.get_user_option('bound') == 'True')
3025
        if config_bound != bound:
3026
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
3027
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
3028
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
3029
    def get_bound_location(self):
3030
        """See Branch.set_push_location."""
3031
        return self._get_bound_location(True)
3032
3033
    def get_old_bound_location(self):
3034
        """See Branch.get_old_bound_location"""
3035
        return self._get_bound_location(False)
3036
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
3037
    def get_stacked_on_url(self):
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
3038
        # you can always ask for the URL; but you might not be able to use it
3039
        # if the repo can't support stacking.
3040
        ## self._check_stackable_repo()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
3041
        stacked_url = self._get_config_location('stacked_on_location')
3042
        if stacked_url is None:
3221.11.6 by Robert Collins
Stackable branch fixes.
3043
            raise errors.NotStacked(self)
3044
        return stacked_url
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3045
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
3046
    def _get_append_revisions_only(self):
4989.2.13 by Vincent Ladeuil
append_revisions_only accept all valid booleans, update doc to
3047
        return self.get_config(
3048
            ).get_user_option_as_bool('append_revisions_only')
2230.3.32 by Aaron Bentley
Implement strict history policy
3049
3240.1.2 by Aaron Bentley
Add write lock
3050
    @needs_write_lock
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
3051
    def generate_revision_history(self, revision_id, last_rev=None,
3052
                                  other_branch=None):
3240.1.6 by Aaron Bentley
Update docs
3053
        """See BzrBranch5.generate_revision_history"""
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
3054
        history = self._lefthand_history(revision_id, last_rev, other_branch)
3055
        revno = len(history)
3056
        self.set_last_revision_info(revno, revision_id)
3057
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
3058
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
3059
    def get_rev_id(self, revno, history=None):
3060
        """Find the revision id of the specified revno."""
3061
        if revno == 0:
3062
            return _mod_revision.NULL_REVISION
3063
3064
        last_revno, last_revision_id = self.last_revision_info()
3065
        if revno <= 0 or revno > last_revno:
3066
            raise errors.NoSuchRevision(self, revno)
3067
3068
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
3069
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
3070
3298.2.10 by Aaron Bentley
Refactor partial history code
3071
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
3072
        if len(self._partial_revision_history_cache) <= index:
3073
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
3074
        if len(self._partial_revision_history_cache) > index:
3075
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
3076
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
3077
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
3078
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
3079
    @needs_read_lock
3080
    def revision_id_to_revno(self, revision_id):
3081
        """Given a revision id, return its revno"""
3082
        if _mod_revision.is_null(revision_id):
3083
            return 0
3084
        try:
3085
            index = self._partial_revision_history_cache.index(revision_id)
3086
        except ValueError:
3087
            self._extend_partial_history(stop_revision=revision_id)
3088
            index = len(self._partial_revision_history_cache) - 1
3089
            if self._partial_revision_history_cache[index] != revision_id:
3090
                raise errors.NoSuchRevision(self, revision_id)
3091
        return self.revno() - index
3092
2230.3.34 by Aaron Bentley
cleanup
3093
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
3094
class BzrBranch7(BzrBranch8):
3095
    """A branch with support for a fallback repository."""
3096
3097
    def set_reference_info(self, file_id, tree_path, branch_location):
3098
        Branch.set_reference_info(self, file_id, tree_path, branch_location)
3099
3100
    def get_reference_info(self, file_id):
3101
        Branch.get_reference_info(self, file_id)
3102
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
3103
    def reference_parent(self, file_id, path, possible_transports=None):
3104
        return Branch.reference_parent(self, file_id, path,
3105
                                       possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
3106
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
3107
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3108
class BzrBranch6(BzrBranch7):
3109
    """See BzrBranchFormat6 for the capabilities of this branch.
3110
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
3111
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
3112
    i.e. stacking.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3113
    """
3114
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
3115
    def get_stacked_on_url(self):
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
3116
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
3117
3118
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3119
######################################################################
3120
# results of operations
3121
2220.2.37 by Martin Pool
Report conflicting tags from push.
3122
3123
class _Result(object):
3124
3125
    def _show_tag_conficts(self, to_file):
3126
        if not getattr(self, 'tag_conflicts', None):
3127
            return
3128
        to_file.write('Conflicting tags:\n')
3129
        for name, value1, value2 in self.tag_conflicts:
3130
            to_file.write('    %s\n' % (name, ))
3131
3132
3133
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3134
    """Result of a Branch.pull operation.
3135
3136
    :ivar old_revno: Revision number before pull.
3137
    :ivar new_revno: Revision number after pull.
3138
    :ivar old_revid: Tip revision id before pull.
3139
    :ivar new_revid: Tip revision id after pull.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3140
    :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.
3141
    :ivar master_branch: Master branch of the target, or the target if no
3142
        Master
3143
    :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.
3144
    :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.
3145
    :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
3146
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3147
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3148
    @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()
3149
    def __int__(self):
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3150
        """Return the relative change in revno.
3151
3152
        :deprecated: Use `new_revno` and `old_revno` instead.
3153
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3154
        return self.new_revno - self.old_revno
3155
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
3156
    def report(self, to_file):
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
3157
        if not is_quiet():
3158
            if self.old_revid == self.new_revid:
3159
                to_file.write('No revisions to pull.\n')
3160
            else:
3161
                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
3162
        self._show_tag_conficts(to_file)
3163
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3164
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
3165
class BranchPushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3166
    """Result of a Branch.push operation.
3167
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
3168
    :ivar old_revno: Revision number (eg 10) of the target before push.
3169
    :ivar new_revno: Revision number (eg 12) of the target after push.
3170
    :ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3171
        before the push.
3172
    :ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3173
        after the push.
3174
    :ivar source_branch: Source branch object that the push was from. This is
3175
        read locked, and generally is a local (and thus low latency) branch.
3176
    :ivar master_branch: If target is a bound branch, the master branch of
3177
        target, or target itself. Always write locked.
3178
    :ivar target_branch: The direct Branch where data is being sent (write
3179
        locked).
3180
    :ivar local_branch: If the target is a bound branch this will be the
3181
        target, otherwise it will be None.
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
3182
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3183
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3184
    @deprecated_method(deprecated_in((2, 3, 0)))
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
3185
    def __int__(self):
5348.1.2 by Martin Pool
Deprecate casting PushResult and PullResult to int to get the relative revno change
3186
        """Return the relative change in revno.
3187
3188
        :deprecated: Use `new_revno` and `old_revno` instead.
3189
        """
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
3190
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3191
2220.2.37 by Martin Pool
Report conflicting tags from push.
3192
    def report(self, to_file):
3193
        """Write a human-readable description of the result."""
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3194
        if self.old_revid == self.new_revid:
3978.2.2 by Jelmer Vernooij
Write status messages during push to stderr rather than stdout.
3195
            note('No new revisions to push.')
2220.2.37 by Martin Pool
Report conflicting tags from push.
3196
        else:
3978.2.2 by Jelmer Vernooij
Write status messages during push to stderr rather than stdout.
3197
            note('Pushed up to revision %d.' % self.new_revno)
2220.2.37 by Martin Pool
Report conflicting tags from push.
3198
        self._show_tag_conficts(to_file)
3199
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
3200
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3201
class BranchCheckResult(object):
3202
    """Results of checking branch consistency.
3203
3204
    :see: Branch.check
3205
    """
3206
3207
    def __init__(self, branch):
3208
        self.branch = branch
4332.3.3 by Robert Collins
Alter Branch.check to log errors rather than raising.
3209
        self.errors = []
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3210
3211
    def report_results(self, verbose):
3212
        """Report the check results via trace.note.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3213
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3214
        :param verbose: Requests more detailed display of what was checked,
3215
            if any.
3216
        """
5158.6.3 by Martin Pool
Update some Branch calls to use ControlComponent style.
3217
        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.
3218
            self.branch._format)
3219
        for error in self.errors:
3220
            note('found error:%s', error)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
3221
3222
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3223
class Converter5to6(object):
3224
    """Perform an in-place upgrade of format 5 to format 6"""
3225
3226
    def convert(self, branch):
3227
        # Data for 5 and 6 can peacefully coexist.
3228
        format = BzrBranchFormat6()
3229
        new_branch = format.open(branch.bzrdir, _found=True)
3230
3231
        # 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.
3232
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3233
        new_branch.set_parent(branch.get_parent())
3234
        new_branch.set_bound_location(branch.get_bound_location())
3235
        new_branch.set_push_location(branch.get_push_location())
3236
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
3237
        # New branch has no tags by default
3238
        new_branch.tags._set_tag_dict({})
3239
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3240
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
3241
        new_branch._transport.put_bytes('format',
3242
            format.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
3243
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3244
3245
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
3246
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3247
        try:
3248
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
3249
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
3250
            pass
3251
        branch.set_bound_location(None)
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
3252
3253
3254
class Converter6to7(object):
3255
    """Perform an in-place upgrade of format 6 to format 7"""
3256
3257
    def convert(self, branch):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
3258
        format = BzrBranchFormat7()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
3259
        branch._set_config_location('stacked_on_location', '')
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
3260
        # update target format
3221.13.5 by Ian Clatworthy
fix LockableFiles deprecations
3261
        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()
3262
3263
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
3264
class Converter7to8(object):
3265
    """Perform an in-place upgrade of format 6 to format 7"""
3266
3267
    def convert(self, branch):
3268
        format = BzrBranchFormat8()
3269
        branch._transport.put_bytes('references', '')
3270
        # update target format
3271
        branch._transport.put_bytes('format', format.get_format_string())
3272
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
3273
3274
def _run_with_write_locked_target(target, callable, *args, **kwargs):
3275
    """Run ``callable(*args, **kwargs)``, write-locking target for the
3276
    duration.
3277
3278
    _run_with_write_locked_target will attempt to release the lock it acquires.
3279
3280
    If an exception is raised by callable, then that exception *will* be
3281
    propagated, even if the unlock attempt raises its own error.  Thus
3282
    _run_with_write_locked_target should be preferred to simply doing::
3283
3284
        target.lock_write()
3285
        try:
3286
            return callable(*args, **kwargs)
3287
        finally:
3288
            target.unlock()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3289
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
3290
    """
3291
    # This is very similar to bzrlib.decorators.needs_write_lock.  Perhaps they
3292
    # should share code?
3293
    target.lock_write()
3294
    try:
3295
        result = callable(*args, **kwargs)
3296
    except:
3297
        exc_info = sys.exc_info()
3298
        try:
3299
            target.unlock()
3300
        finally:
3301
            raise exc_info[0], exc_info[1], exc_info[2]
3302
    else:
3303
        target.unlock()
3304
        return result
3978.3.1 by Jelmer Vernooij
Add InterBranchBzrDir class.
3305
3306
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3307
class InterBranch(InterObject):
3308
    """This class represents operations taking place between two branches.
3309
3310
    Its instances have methods like pull() and push() and contain
3311
    references to the source and target repositories these operations
3312
    can be carried out on.
3313
    """
3314
3315
    _optimisers = []
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3316
    """The available optimised InterBranch types."""
3317
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
3318
    @classmethod
3319
    def _get_branch_formats_to_test(klass):
3320
        """Return an iterable of format tuples for testing.
3321
        
3322
        :return: An iterable of (from_format, to_format) to use when testing
3323
            this InterBranch class. Each InterBranch class should define this
3324
            method itself.
3325
        """
3326
        raise NotImplementedError(klass._get_branch_formats_to_test)
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3327
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3328
    @needs_write_lock
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3329
    def pull(self, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3330
             possible_transports=None, local=False):
4000.5.10 by Jelmer Vernooij
Fix comment for InterBranch.pull.
3331
        """Mirror source into target branch.
3332
3333
        The target branch is considered to be 'local', having low latency.
3334
3335
        :returns: PullResult instance
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3336
        """
3337
        raise NotImplementedError(self.pull)
3338
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3339
    @needs_write_lock
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3340
    def update_revisions(self, stop_revision=None, overwrite=False,
3341
                         graph=None):
3342
        """Pull in new perfect-fit revisions.
3343
3344
        :param stop_revision: Updated until the given revision
3345
        :param overwrite: Always set the branch pointer, rather than checking
3346
            to see if it is a proper descendant.
3347
        :param graph: A Graph object that can be used to query history
3348
            information. This can be None.
3349
        :return: None
3350
        """
3351
        raise NotImplementedError(self.update_revisions)
3352
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3353
    @needs_write_lock
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3354
    def push(self, overwrite=False, stop_revision=None,
3355
             _override_hook_source_branch=None):
3356
        """Mirror the source branch into the target branch.
3357
3358
        The source branch is considered to be 'local', having low latency.
3359
        """
3360
        raise NotImplementedError(self.push)
3361
5358.1.1 by Jelmer Vernooij
Add stub for InterBranch.copy_content_into.
3362
    @needs_write_lock
3363
    def copy_content_into(self, revision_id=None):
3364
        """Copy the content of source into target
3365
3366
        revision_id: if not None, the revision history in the new branch will
3367
                     be truncated to end with revision_id.
3368
        """
3369
        raise NotImplementedError(self.copy_content_into)
3370
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
3371
3372
class GenericInterBranch(InterBranch):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3373
    """InterBranch implementation that uses public Branch functions."""
3374
3375
    @classmethod
3376
    def is_compatible(klass, source, target):
3377
        # GenericBranch uses the public API, so always compatible
3378
        return True
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3379
5297.2.1 by Robert Collins
``bzrlib.branch.InterBranch._get_branch_formats_to_test`` now returns
3380
    @classmethod
3381
    def _get_branch_formats_to_test(klass):
3382
        return [(BranchFormat._default_format, BranchFormat._default_format)]
4000.5.3 by Jelmer Vernooij
Add tests for InterBranch.
3383
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3384
    @classmethod
3385
    def unwrap_format(klass, format):
3386
        if isinstance(format, remote.RemoteBranchFormat):
3387
            format._ensure_real()
3388
            return format._custom_format
5050.53.4 by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge.
3389
        return format
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3390
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3391
    @needs_write_lock
3392
    def copy_content_into(self, revision_id=None):
3393
        """Copy the content of source into target
3394
3395
        revision_id: if not None, the revision history in the new branch will
3396
                     be truncated to end with revision_id.
3397
        """
3398
        self.source.update_references(self.target)
3399
        self.source._synchronize_history(self.target, revision_id)
3400
        try:
3401
            parent = self.source.get_parent()
3402
        except errors.InaccessibleParent, e:
3403
            mutter('parent was not accessible to copy: %s', e)
3404
        else:
3405
            if parent:
3406
                self.target.set_parent(parent)
3407
        if self.source._push_should_merge_tags():
5284.4.3 by Robert Collins
Fix missed self.source change in copy_content_into.
3408
            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
3409
3410
    @needs_write_lock
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3411
    def update_revisions(self, stop_revision=None, overwrite=False,
3412
        graph=None):
3413
        """See InterBranch.update_revisions()."""
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3414
        other_revno, other_last_revision = self.source.last_revision_info()
3415
        stop_revno = None # unknown
3416
        if stop_revision is None:
3417
            stop_revision = other_last_revision
3418
            if _mod_revision.is_null(stop_revision):
3419
                # if there are no commits, we're done.
3420
                return
3421
            stop_revno = other_revno
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3422
5284.4.2 by Robert Collins
* ``Branch.copy_content_into`` is now a convenience method dispatching to
3423
        # what's the current last revision, before we fetch [and change it
3424
        # possibly]
3425
        last_rev = _mod_revision.ensure_null(self.target.last_revision())
3426
        # we fetch here so that we don't process data twice in the common
3427
        # case of having something to pull, and so that the check for
3428
        # already merged can operate on the just fetched graph, which will
3429
        # be cached in memory.
3430
        self.target.fetch(self.source, stop_revision)
3431
        # Check to see if one is an ancestor of the other
3432
        if not overwrite:
3433
            if graph is None:
3434
                graph = self.target.repository.get_graph()
3435
            if self.target._check_if_descendant_or_diverged(
3436
                    stop_revision, last_rev, graph, self.source):
3437
                # stop_revision is a descendant of last_rev, but we aren't
3438
                # overwriting, so we're done.
3439
                return
3440
        if stop_revno is None:
3441
            if graph is None:
3442
                graph = self.target.repository.get_graph()
3443
            this_revno, this_last_revision = \
3444
                    self.target.last_revision_info()
3445
            stop_revno = graph.find_distance_to_null(stop_revision,
3446
                            [(other_last_revision, other_revno),
3447
                             (this_last_revision, this_revno)])
3448
        self.target.set_last_revision_info(stop_revno, stop_revision)
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3449
5297.2.2 by Robert Collins
Fixup tests in per_interbranch not being strict about making the from format the configured one.
3450
    @needs_write_lock
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3451
    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
3452
             possible_transports=None, run_hooks=True,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3453
             _override_hook_target=None, local=False):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3454
        """Pull from source into self, updating my master if any.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3455
3456
        :param run_hooks: Private parameter - if false, this branch
3457
            is being called because it's the master of the primary branch,
3458
            so it should not run its hooks.
3459
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3460
        bound_location = self.target.get_bound_location()
3461
        if local and not bound_location:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3462
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3463
        master_branch = None
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3464
        source_is_master = (self.source.user_url == bound_location)
3465
        if not local and bound_location and not source_is_master:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3466
            # not pulling from master, so we need to update master.
3467
            master_branch = self.target.get_master_branch(possible_transports)
3468
            master_branch.lock_write()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3469
        try:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3470
            if master_branch:
3471
                # pull from source into master.
3472
                master_branch.pull(self.source, overwrite, stop_revision,
3473
                    run_hooks=False)
3474
            return self._pull(overwrite,
3475
                stop_revision, _hook_master=master_branch,
3476
                run_hooks=run_hooks,
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3477
                _override_hook_target=_override_hook_target,
3478
                merge_tags_to_master=not source_is_master)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3479
        finally:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3480
            if master_branch:
3481
                master_branch.unlock()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3482
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3483
    def push(self, overwrite=False, stop_revision=None,
3484
             _override_hook_source_branch=None):
3485
        """See InterBranch.push.
3486
3487
        This is the basic concrete implementation of push()
3488
3489
        :param _override_hook_source_branch: If specified, run
3490
        the hooks passing this Branch as the source, rather than self.
3491
        This is for use of RemoteBranch, where push is delegated to the
3492
        underlying vfs-based Branch.
3493
        """
3494
        # TODO: Public option to disable running hooks - should be trivial but
3495
        # needs tests.
3496
        self.source.lock_read()
3497
        try:
3498
            return _run_with_write_locked_target(
3499
                self.target, self._push_with_bound_branches, overwrite,
3500
                stop_revision,
3501
                _override_hook_source_branch=_override_hook_source_branch)
3502
        finally:
3503
            self.source.unlock()
3504
3505
    def _push_with_bound_branches(self, overwrite, stop_revision,
3506
            _override_hook_source_branch=None):
3507
        """Push from source into target, and into target's master if any.
3508
        """
3509
        def _run_hooks():
3510
            if _override_hook_source_branch:
3511
                result.source_branch = _override_hook_source_branch
3512
            for hook in Branch.hooks['post_push']:
3513
                hook(result)
3514
3515
        bound_location = self.target.get_bound_location()
3516
        if bound_location and self.target.base != bound_location:
3517
            # there is a master branch.
3518
            #
3519
            # XXX: Why the second check?  Is it even supported for a branch to
3520
            # be bound to itself? -- mbp 20070507
3521
            master_branch = self.target.get_master_branch()
3522
            master_branch.lock_write()
3523
            try:
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3524
                # push into the master from the source branch.
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3525
                self.source._basic_push(master_branch, overwrite, stop_revision)
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3526
                # 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
3527
                # 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().
3528
                # highest bandwidth repository.
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
                result.master_branch = master_branch
3532
                result.local_branch = self.target
3533
                _run_hooks()
3534
                return result
3535
            finally:
3536
                master_branch.unlock()
3537
        else:
3538
            # no master branch
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3539
            result = self.source._basic_push(self.target, overwrite,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3540
                stop_revision)
3541
            # TODO: Why set master_branch and local_branch if there's no
3542
            # binding?  Maybe cleaner to just leave them unset? -- mbp
3543
            # 20070504
3544
            result.master_branch = self.target
3545
            result.local_branch = None
3546
            _run_hooks()
3547
            return result
3548
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3549
    def _pull(self, overwrite=False, stop_revision=None,
3550
             possible_transports=None, _hook_master=None, run_hooks=True,
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3551
             _override_hook_target=None, local=False,
3552
             merge_tags_to_master=True):
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3553
        """See Branch.pull.
3554
3555
        This function is the core worker, used by GenericInterBranch.pull to
3556
        avoid duplication when pulling source->master and source->local.
3557
3558
        :param _hook_master: Private parameter - set the branch to
3559
            be supplied as the master to pull hooks.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3560
        :param run_hooks: Private parameter - if false, this branch
3561
            is being called because it's the master of the primary branch,
3562
            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
3563
        :param _override_hook_target: Private parameter - set the branch to be
3564
            supplied as the target_branch to pull hooks.
3565
        :param local: Only update the local branch, and not the bound branch.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3566
        """
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3567
        # This type of branch can't be bound.
3568
        if local:
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3569
            raise errors.LocalRequiresBoundBranch()
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3570
        result = PullResult()
3571
        result.source_branch = self.source
3572
        if _override_hook_target is None:
3573
            result.target_branch = self.target
3574
        else:
3575
            result.target_branch = _override_hook_target
3576
        self.source.lock_read()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3577
        try:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3578
            # We assume that during 'pull' the target repository is closer than
3579
            # the source one.
3580
            self.source.update_references(self.target)
3581
            graph = self.target.repository.get_graph(self.source.repository)
3582
            # TODO: Branch formats should have a flag that indicates 
3583
            # that revno's are expensive, and pull() should honor that flag.
3584
            # -- JRV20090506
3585
            result.old_revno, result.old_revid = \
3586
                self.target.last_revision_info()
3587
            self.target.update_revisions(self.source, stop_revision,
3588
                overwrite=overwrite, graph=graph)
3589
            # TODO: The old revid should be specified when merging tags, 
3590
            # so a tags implementation that versions tags can only 
3591
            # pull in the most recent changes. -- JRV20090506
3592
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
5582.5.1 by John Arbash Meinel
Fix bug 701212. Don't set the tags for a master branch during update.
3593
                overwrite, ignore_master=not merge_tags_to_master)
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3594
            result.new_revno, result.new_revid = self.target.last_revision_info()
3595
            if _hook_master:
3596
                result.master_branch = _hook_master
3597
                result.local_branch = result.target_branch
3598
            else:
3599
                result.master_branch = result.target_branch
3600
                result.local_branch = None
3601
            if run_hooks:
3602
                for hook in Branch.hooks['post_pull']:
3603
                    hook(result)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3604
        finally:
5284.4.1 by Robert Collins
* Fetching was slightly confused about the best code to use and was
3605
            self.source.unlock()
3606
        return result
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3607
3608
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3609
InterBranch.register_optimiser(GenericInterBranch)