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