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