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