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