/brz/remove-bazaar

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