~bzr-pqm/bzr/bzr.dev

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