/brz/remove-bazaar

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