/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
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
870
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
871
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
872
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
873
874
    def get_parent(self):
875
        """Return the parent location of the branch.
876
4031.1.1 by Alexander Belchenko
Parent location is not used as default for push.
877
        This is the default location for pull/missing.  The usual
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
878
        pattern is that the user can override it by specifying a
879
        location.
880
        """
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
881
        parent = self._get_parent_location()
882
        if parent is None:
883
            return parent
884
        # This is an old-format absolute path to a local branch
885
        # turn it into a url
886
        if parent.startswith('/'):
887
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
888
        try:
889
            return urlutils.join(self.base[:-1], parent)
890
        except errors.InvalidURLJoin, e:
891
            raise errors.InaccessibleParent(parent, self.base)
892
893
    def _get_parent_location(self):
894
        raise NotImplementedError(self._get_parent_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
895
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
896
    def _set_config_location(self, name, url, config=None,
897
                             make_relative=False):
898
        if config is None:
899
            config = self.get_config()
900
        if url is None:
901
            url = ''
902
        elif make_relative:
903
            url = urlutils.relative_url(self.base, url)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
904
        config.set_user_option(name, url, warn_masked=True)
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
905
906
    def _get_config_location(self, name, config=None):
907
        if config is None:
908
            config = self.get_config()
909
        location = config.get_user_option(name)
910
        if location == '':
911
            location = None
912
        return location
913
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
914
    def get_submit_branch(self):
915
        """Return the submit location of the branch.
916
917
        This is the default location for bundle.  The usual
918
        pattern is that the user can override it by specifying a
919
        location.
920
        """
921
        return self.get_config().get_user_option('submit_branch')
922
923
    def set_submit_branch(self, location):
924
        """Return the submit location of the branch.
925
926
        This is the default location for bundle.  The usual
927
        pattern is that the user can override it by specifying a
928
        location.
929
        """
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
930
        self.get_config().set_user_option('submit_branch', location,
931
            warn_masked=True)
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
932
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
933
    def get_public_branch(self):
934
        """Return the public location of the branch.
935
4031.3.1 by Frank Aspell
Fixing various typos
936
        This is used by merge directives.
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
937
        """
938
        return self._get_config_location('public_branch')
939
940
    def set_public_branch(self, location):
941
        """Return the submit location of the branch.
942
943
        This is the default location for bundle.  The usual
944
        pattern is that the user can override it by specifying a
945
        location.
946
        """
947
        self._set_config_location('public_branch', location)
948
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
949
    def get_push_location(self):
950
        """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).
951
        push_loc = self.get_config().get_user_option('push_location')
952
        return push_loc
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
953
954
    def set_push_location(self, location):
955
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
956
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
957
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.
958
    def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
959
        """Run the post_change_branch_tip hooks."""
960
        hooks = Branch.hooks['post_change_branch_tip']
961
        if not hooks:
962
            return
963
        new_revno, new_revid = self.last_revision_info()
964
        params = ChangeBranchTipParams(
965
            self, old_revno, new_revno, old_revid, new_revid)
966
        for hook in hooks:
967
            hook(params)
968
969
    def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
970
        """Run the pre_change_branch_tip hooks."""
971
        hooks = Branch.hooks['pre_change_branch_tip']
972
        if not hooks:
973
            return
974
        old_revno, old_revid = self.last_revision_info()
975
        params = ChangeBranchTipParams(
976
            self, old_revno, new_revno, old_revid, new_revid)
977
        for hook in hooks:
978
            try:
979
                hook(params)
980
            except errors.TipChangeRejected:
981
                raise
982
            except Exception:
983
                exc_info = sys.exc_info()
984
                hook_name = Branch.hooks.get_hook_name(hook)
985
                raise errors.HookFailed(
986
                    'pre_change_branch_tip', hook_name, exc_info)
987
1587.1.10 by Robert Collins
update updates working tree and branch together.
988
    @needs_write_lock
989
    def update(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
990
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
991
992
        :return: None or the last_revision pivoted out during the update.
993
        """
994
        return None
995
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
996
    def check_revno(self, revno):
997
        """\
998
        Check whether a revno corresponds to any revision.
999
        Zero (the NULL revision) is considered valid.
1000
        """
1001
        if revno != 0:
1002
            self.check_real_revno(revno)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1003
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1004
    def check_real_revno(self, revno):
1005
        """\
1006
        Check whether a revno corresponds to a real revision.
1007
        Zero (the NULL revision) is considered invalid
1008
        """
1009
        if revno < 1 or revno > self.revno():
3236.1.2 by Michael Hudson
clean up branch.py imports
1010
            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.
1011
1012
    @needs_read_lock
4050.1.1 by Robert Collins
Fix race condition with branch hooks during cloning when the new branch is stacked.
1013
    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.
1014
        """Clone this branch into to_bzrdir preserving all semantic values.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1015
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1016
        Most API users will want 'create_clone_on_transport', which creates a
1017
        new bzrdir and branch on the fly.
1018
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.
1019
        revision_id: if not None, the revision history in the new branch will
1020
                     be truncated to end with revision_id.
1021
        """
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
1022
        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.
1023
        result.lock_write()
1024
        try:
1025
            if repository_policy is not None:
1026
                repository_policy.configure_branch(result)
1027
            self.copy_content_into(result, revision_id=revision_id)
1028
        finally:
1029
            result.unlock()
1030
        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.
1031
1032
    @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.
1033
    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.
1034
        """Create a new line of development from the branch, into to_bzrdir.
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
1035
1036
        to_bzrdir controls the branch format.
1037
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.
1038
        revision_id: if not None, the revision history in the new branch will
1039
                     be truncated to end with revision_id.
1040
        """
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
1041
        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.
1042
        result.lock_write()
4288.1.8 by Robert Collins
Lock new branches while we configure them in clone and sprout for less lock churn.
1043
        try:
1044
            if repository_policy is not None:
1045
                repository_policy.configure_branch(result)
1046
            self.copy_content_into(result, revision_id=revision_id)
1047
            result.set_parent(self.bzrdir.root_transport.base)
1048
        finally:
1049
            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.
1050
        return result
1051
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
1052
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1053
        """Synchronize last revision and revision history between branches.
1054
1055
        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.
1056
        BzrBranch6, but works for BzrBranch5, as long as the destination's
1057
        repository contains all the lefthand ancestors of the intended
1058
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
1059
1060
        :param destination: The branch to copy the history into
1061
        :param revision_id: The revision-id to truncate history at.  May
1062
          be None to copy complete history.
1063
        """
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1064
        source_revno, source_revision_id = self.last_revision_info()
1065
        if revision_id is None:
1066
            revno, revision_id = source_revno, source_revision_id
1067
        elif source_revision_id == revision_id:
1068
            # we know the revno without needing to walk all of history
1069
            revno = source_revno
3650.3.3 by Aaron Bentley
fix sprout
1070
        else:
3834.3.1 by Andrew Bennetts
Get rid of revision_history() call during copy_content_into.
1071
            # To figure out the revno for a random revision, we need to build
1072
            # the revision history, and count its length.
1073
            # We don't care about the order, just how long it is.
1074
            # Alternatively, we could start at the current location, and count
1075
            # backwards. But there is no guarantee that we will find it since
1076
            # it may be a merged revision.
1077
            revno = len(list(self.repository.iter_reverse_revision_history(
1078
                                                                revision_id)))
1079
        destination.set_last_revision_info(revno, revision_id)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1080
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.
1081
    @needs_read_lock
1082
    def copy_content_into(self, destination, revision_id=None):
1083
        """Copy the content of self into destination.
1084
1085
        revision_id: if not None, the revision history in the new branch will
1086
                     be truncated to end with revision_id.
1087
        """
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1088
        self.update_references(destination)
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
1089
        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)
1090
        try:
1091
            parent = self.get_parent()
1092
        except errors.InaccessibleParent, e:
1093
            mutter('parent was not accessible to copy: %s', e)
1094
        else:
1095
            if parent:
1096
                destination.set_parent(parent)
4032.3.3 by Robert Collins
Use the same logic push does to avoid tags operations when pushing new branches.
1097
        if self._push_should_merge_tags():
1098
            self.tags.merge_to(destination.tags)
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1099
1100
    def update_references(self, target):
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
1101
        if not getattr(self._format, 'supports_reference_locations', False):
1102
            return
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1103
        reference_dict = self._get_all_reference_info()
4273.1.9 by Aaron Bentley
Cleanup
1104
        if len(reference_dict) == 0:
1105
            return
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1106
        old_base = self.base
1107
        new_base = target.base
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1108
        target_reference_dict = target._get_all_reference_info()
4273.1.6 by Aaron Bentley
Ensure references are rebased.
1109
        for file_id, (tree_path, branch_location) in (
1110
            reference_dict.items()):
1111
            branch_location = urlutils.rebase_url(branch_location,
1112
                                                  old_base, new_base)
4273.1.7 by Aaron Bentley
Make update_references do a merge.
1113
            target_reference_dict.setdefault(
1114
                file_id, (tree_path, branch_location))
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
1115
        target._set_all_reference_info(target_reference_dict)
1185.66.1 by Aaron Bentley
Merged from mainline
1116
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1117
    @needs_read_lock
1118
    def check(self):
1119
        """Check consistency of the branch.
1120
1121
        In particular this checks that revisions given in the revision-history
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1122
        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
1123
        present in the repository.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1124
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1125
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1126
1127
        :return: A BranchCheckResult.
1128
        """
1129
        mainline_parent_id = None
3389.2.1 by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent.
1130
        last_revno, last_revision_id = self.last_revision_info()
1131
        real_rev_history = list(self.repository.iter_reverse_revision_history(
1132
                                last_revision_id))
1133
        real_rev_history.reverse()
1134
        if len(real_rev_history) != last_revno:
1135
            raise errors.BzrCheckError('revno does not match len(mainline)'
1136
                ' %s != %s' % (last_revno, len(real_rev_history)))
1137
        # TODO: We should probably also check that real_rev_history actually
1138
        #       matches self.revision_history()
1139
        for revision_id in real_rev_history:
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1140
            try:
1141
                revision = self.repository.get_revision(revision_id)
1142
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1143
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
1144
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1145
            # In general the first entry on the revision history has no parents.
1146
            # But it's not illegal for it to have parents listed; this can happen
1147
            # in imports from Arch when the parents weren't reachable.
1148
            if mainline_parent_id is not None:
1149
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1150
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1151
                                        "parents of {%s}"
1152
                                        % (mainline_parent_id, revision_id))
1153
            mainline_parent_id = revision_id
1154
        return BranchCheckResult(self)
1155
1910.2.39 by Aaron Bentley
Fix checkout bug
1156
    def _get_checkout_format(self):
1157
        """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.
1158
        Weaves are used if this branch's repository uses weaves.
1910.2.39 by Aaron Bentley
Fix checkout bug
1159
        """
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.
1160
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1161
            from bzrlib.repofmt import weaverepo
1910.2.39 by Aaron Bentley
Fix checkout bug
1162
            format = bzrdir.BzrDirMetaFormat1()
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
1163
            format.repository_format = weaverepo.RepositoryFormat7()
1910.2.39 by Aaron Bentley
Fix checkout bug
1164
        else:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1165
            format = self.repository.bzrdir.checkout_metadir()
2370.3.2 by John Arbash Meinel
Use BzrDir.set_branch_format() rather than setting it directly.
1166
            format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
1167
        return format
1168
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1169
    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.
1170
        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.
1171
        """Create a clone of this branch and its bzrdir.
1172
1173
        :param to_transport: The transport to clone onto.
1174
        :param revision_id: The revision id to use as tip in the new branch.
1175
            If None the tip is obtained from this branch.
1176
        :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.
1177
        :param create_prefix: Create any missing directories leading up to
1178
            to_transport.
1179
        :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.
1180
        """
4044.1.2 by Robert Collins
Reinstate the TODO comment about bzrdir.clone_on_transport.
1181
        # XXX: Fix the bzrdir API to allow getting the branch back from the
1182
        # 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.
1183
        if revision_id is None:
1184
            revision_id = self.last_revision()
4294.2.3 by Robert Collins
Move UI exception raising back to branch.py.
1185
        try:
1186
            dir_to = self.bzrdir.clone_on_transport(to_transport,
1187
                revision_id=revision_id, stacked_on=stacked_on,
1188
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1189
        except errors.FileExists:
1190
            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.
1191
                raise
4294.2.3 by Robert Collins
Move UI exception raising back to branch.py.
1192
        except errors.NoSuchFile:
1193
            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.
1194
                raise
4044.1.1 by Robert Collins
Create Branch.create_clone_on_transport helper method to combine bzr and branch creation for push.
1195
        return dir_to.open_branch()
1196
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1197
    def create_checkout(self, to_location, revision_id=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1198
                        lightweight=False, accelerator_tree=None,
1199
                        hardlink=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1200
        """Create a checkout of a branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1201
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1202
        :param to_location: The url to produce the checkout at
1203
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
1204
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1205
        produce a bound branch (heavyweight checkout)
3123.5.17 by Aaron Bentley
Update docs
1206
        :param accelerator_tree: A tree which can be used for retrieving file
1207
            contents more quickly than the revision tree, i.e. a workingtree.
1208
            The revision tree will be used for cases where accelerator_tree's
1209
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1210
        :param hardlink: If true, hard-link files from accelerator_tree,
1211
            where possible.
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1212
        :return: The tree of the created checkout
1213
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
1214
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
1215
        t.ensure_base()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1216
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
1217
            format = self._get_checkout_format()
1218
            checkout = format.initialize_on_transport(t)
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
1219
            from_branch = BranchReferenceFormat().initialize(checkout, self)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1220
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
1221
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1222
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
1223
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1224
            checkout = checkout_branch.bzrdir
1225
            checkout_branch.bind(self)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1226
            # 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
1227
            # branch tip correctly, and seed it with history.
1228
            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.
1229
            from_branch=None
1230
        tree = checkout.create_workingtree(revision_id,
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1231
                                           from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1232
                                           accelerator_tree=accelerator_tree,
1233
                                           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.
1234
        basis_tree = tree.basis_tree()
1235
        basis_tree.lock_read()
1236
        try:
1237
            for path, file_id in basis_tree.iter_references():
1238
                reference_parent = self.reference_parent(file_id, path)
1239
                reference_parent.create_checkout(tree.abspath(path),
1240
                    basis_tree.get_reference_revision(file_id, path),
1241
                    lightweight)
1242
        finally:
1243
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1244
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
1245
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
1246
    @needs_write_lock
1247
    def reconcile(self, thorough=True):
1248
        """Make sure the data stored in this branch is consistent."""
1249
        from bzrlib.reconcile import BranchReconciler
1250
        reconciler = BranchReconciler(self, thorough=thorough)
1251
        reconciler.reconcile()
1252
        return reconciler
1253
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
1254
    def reference_parent(self, file_id, path, possible_transports=None):
2100.3.29 by Aaron Bentley
Get merge working initially
1255
        """Return the parent branch for a tree-reference file_id
1256
        :param file_id: The file_id of the tree reference
1257
        :param path: The path of the file_id in the tree
1258
        :return: A branch associated with the file_id
1259
        """
1260
        # FIXME should provide multiple branches, based on config
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
1261
        return Branch.open(self.bzrdir.root_transport.clone(path).base,
1262
                           possible_transports=possible_transports)
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
1263
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
1264
    def supports_tags(self):
1265
        return self._format.supports_tags()
1266
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.
1267
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1268
                                         other_branch):
3441.5.18 by Andrew Bennetts
Fix some test failures.
1269
        """Ensure that revision_b is a descendant of revision_a.
1270
1271
        This is a helper function for update_revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1272
3441.5.18 by Andrew Bennetts
Fix some test failures.
1273
        :raises: DivergedBranches if revision_b has diverged from revision_a.
1274
        :returns: True if revision_b is a descendant of revision_a.
1275
        """
1276
        relation = self._revision_relations(revision_a, revision_b, graph)
1277
        if relation == 'b_descends_from_a':
1278
            return True
1279
        elif relation == 'diverged':
1280
            raise errors.DivergedBranches(self, other_branch)
1281
        elif relation == 'a_descends_from_b':
1282
            return False
1283
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1284
            raise AssertionError("invalid relation: %r" % (relation,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1285
1286
    def _revision_relations(self, revision_a, revision_b, graph):
1287
        """Determine the relationship between two revisions.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1288
3441.5.18 by Andrew Bennetts
Fix some test failures.
1289
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1290
        """
1291
        heads = graph.heads([revision_a, revision_b])
1292
        if heads == set([revision_b]):
1293
            return 'b_descends_from_a'
1294
        elif heads == set([revision_a, revision_b]):
1295
            # These branches have diverged
1296
            return 'diverged'
1297
        elif heads == set([revision_a]):
1298
            return 'a_descends_from_b'
1299
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1300
            raise AssertionError("invalid heads: %r" % (heads,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
1301
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1302
1303
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1304
    """An encapsulation of the initialization and open routines for a format.
1305
1306
    Formats provide three things:
1307
     * An initialization routine,
1308
     * a format string,
1309
     * an open routine.
1310
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1311
    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.
1312
    during branch opening. Its not required that these be instances, they
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1313
    can be classes themselves with class methods - it simply depends on
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1314
    whether state is needed for a given format or not.
1315
1316
    Once a format is deprecated, just deprecate the initialize and open
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1317
    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.
1318
    object will be created every time regardless.
1319
    """
1320
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1321
    _default_format = None
1322
    """The default format used for new branches."""
1323
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1324
    _formats = {}
1325
    """The known formats."""
1326
2363.5.5 by Aaron Bentley
add info.describe_format
1327
    def __eq__(self, other):
1328
        return self.__class__ is other.__class__
1329
1330
    def __ne__(self, other):
1331
        return not (self == other)
1332
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1333
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1334
    def find_format(klass, a_bzrdir):
1335
        """Return the format for the branch object in a_bzrdir."""
1336
        try:
1337
            transport = a_bzrdir.get_branch_transport(None)
1338
            format_string = transport.get("format").read()
1339
            return klass._formats[format_string]
3236.1.2 by Michael Hudson
clean up branch.py imports
1340
        except errors.NoSuchFile:
1341
            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.
1342
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
1343
            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.
1344
1345
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1346
    def get_default_format(klass):
1347
        """Return the current default format."""
1348
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1349
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1350
    def get_reference(self, a_bzrdir):
1351
        """Get the target reference of the branch in a_bzrdir.
1352
1353
        format probing must have been completed before calling
1354
        this method - it is assumed that the format of the branch
1355
        in a_bzrdir is correct.
1356
1357
        :param a_bzrdir: The bzrdir to get the branch data from.
1358
        :return: None if the branch is not a reference branch.
1359
        """
1360
        return None
1361
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1362
    @classmethod
1363
    def set_reference(self, a_bzrdir, to_branch):
1364
        """Set the target reference of the branch in a_bzrdir.
1365
1366
        format probing must have been completed before calling
1367
        this method - it is assumed that the format of the branch
1368
        in a_bzrdir is correct.
1369
1370
        :param a_bzrdir: The bzrdir to set the branch reference for.
1371
        :param to_branch: branch that the checkout is to reference
1372
        """
1373
        raise NotImplementedError(self.set_reference)
1374
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1375
    def get_format_string(self):
1376
        """Return the ASCII format string that identifies this format."""
1377
        raise NotImplementedError(self.get_format_string)
1378
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1379
    def get_format_description(self):
1380
        """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).
1381
        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
1382
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1383
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1384
                           set_format=True):
1385
        """Initialize a branch in a bzrdir, with specified files
1386
1387
        :param a_bzrdir: The bzrdir to initialize the branch in
1388
        :param utf8_files: The files to create as a list of
1389
            (filename, content) tuples
1390
        :param set_format: If True, set the format with
1391
            self.get_format_string.  (BzrBranch4 has its format set
1392
            elsewhere)
1393
        :return: a branch in this format
1394
        """
1395
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1396
        branch_transport = a_bzrdir.get_branch_transport(self)
1397
        lock_map = {
1398
            'metadir': ('lock', lockdir.LockDir),
1399
            'branch4': ('branch-lock', lockable_files.TransportLock),
1400
        }
1401
        lock_name, lock_class = lock_map[lock_type]
1402
        control_files = lockable_files.LockableFiles(branch_transport,
1403
            lock_name, lock_class)
1404
        control_files.create_lock()
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
1405
        try:
1406
            control_files.lock_write()
1407
        except errors.LockContention:
1408
            if lock_type != 'branch4':
1409
                raise
1410
            lock_taken = False
1411
        else:
1412
            lock_taken = True
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1413
        if set_format:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1414
            utf8_files += [('format', self.get_format_string())]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1415
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1416
            for (filename, content) in utf8_files:
1417
                branch_transport.put_bytes(
1418
                    filename, content,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
1419
                    mode=a_bzrdir._get_file_mode())
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1420
        finally:
4307.2.2 by Robert Collins
Lock repositories created by BzrDirFormat.initialize_on_transport_ex.
1421
            if lock_taken:
1422
                control_files.unlock()
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1423
        return self.open(a_bzrdir, _found=True)
1424
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1425
    def initialize(self, a_bzrdir):
1426
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1427
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1428
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.
1429
    def is_supported(self):
1430
        """Is this format supported?
1431
1432
        Supported formats can be initialized and opened.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1433
        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.
1434
        some other features depending on the reason for not being supported.
1435
        """
1436
        return True
1437
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.
1438
    def make_tags(self, branch):
1439
        """Create a tags object for branch.
1440
1441
        This method is on BranchFormat, because BranchFormats are reflected
1442
        over the wire via network_name(), whereas full Branch instances require
1443
        multiple VFS method calls to operate at all.
1444
1445
        The default implementation returns a disabled-tags instance.
1446
1447
        Note that it is normal for branch to be a RemoteBranch when using tags
1448
        on a RemoteBranch.
1449
        """
1450
        return DisabledTags(branch)
1451
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1452
    def network_name(self):
1453
        """A simple byte string uniquely identifying this format for RPC calls.
1454
1455
        MetaDir branch formats use their disk format string to identify the
1456
        repository over the wire. All in one formats such as bzr < 0.8, and
1457
        foreign formats like svn/git and hg should use some marker which is
1458
        unique and immutable.
1459
        """
1460
        raise NotImplementedError(self.network_name)
1461
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1462
    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1463
        """Return the branch object for a_bzrdir
1464
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1465
        :param a_bzrdir: A BzrDir that contains a branch.
1466
        :param _found: a private parameter, do not use it. It is used to
1467
            indicate if format probing has already be done.
1468
        :param ignore_fallbacks: when set, no fallback branches will be opened
1469
            (if there are any).  Default is to open fallbacks.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1470
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1471
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1472
1473
    @classmethod
1474
    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.
1475
        """Register a metadir format."""
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1476
        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.
1477
        # Metadir formats have a network name of their format string, and get
1478
        # registered as class factories.
1479
        network_format_registry.register(format.get_format_string(), format.__class__)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1480
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.
1481
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1482
    def set_default_format(klass, format):
1483
        klass._default_format = format
1484
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1485
    def supports_stacking(self):
1486
        """True if this format records a stacked-on branch."""
1487
        return False
1488
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1489
    @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.
1490
    def unregister_format(klass, format):
1491
        del klass._formats[format.get_format_string()]
1492
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1493
    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.
1494
        return self.get_format_description().rstrip()
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1495
2220.2.10 by Martin Pool
(broken) start moving things to branches
1496
    def supports_tags(self):
1497
        """True if this format supports tags stored in the branch"""
1498
        return False  # by default
1499
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1500
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1501
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1502
    """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
1503
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1504
    e.g. ['set_rh'] Is the list of items to be called when the
1505
    set_revision_history function is invoked.
1506
    """
1507
1508
    def __init__(self):
1509
        """Create the default hooks.
1510
1511
        These are all empty initially, because by default nothing should get
1512
        notified.
1513
        """
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1514
        Hooks.__init__(self)
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
1515
        self.create_hook(HookPoint('set_rh',
1516
            "Invoked whenever the revision history has been set via "
1517
            "set_revision_history. The api signature is (branch, "
1518
            "revision_history), and the branch will be write-locked. "
1519
            "The set_rh hook can be expensive for bzr to trigger, a better "
1520
            "hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1521
        self.create_hook(HookPoint('open',
1522
            "Called with the Branch object that has been opened after a "
1523
            "branch is opened.", (1, 8), None))
1524
        self.create_hook(HookPoint('post_push',
1525
            "Called after a push operation completes. post_push is called "
4053.3.4 by Jelmer Vernooij
Update branch hooks documentation.
1526
            "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.
1527
            "bzr client.", (0, 15), None))
1528
        self.create_hook(HookPoint('post_pull',
1529
            "Called after a pull operation completes. post_pull is called "
1530
            "with a bzrlib.branch.PullResult object and only runs in the "
1531
            "bzr client.", (0, 15), None))
1532
        self.create_hook(HookPoint('pre_commit',
1533
            "Called after a commit is calculated but before it is is "
1534
            "completed. pre_commit is called with (local, master, old_revno, "
1535
            "old_revid, future_revno, future_revid, tree_delta, future_tree"
1536
            "). old_revid is NULL_REVISION for the first commit to a branch, "
1537
            "tree_delta is a TreeDelta object describing changes from the "
1538
            "basis revision. hooks MUST NOT modify this delta. "
1539
            " future_tree is an in-memory tree obtained from "
1540
            "CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1541
            "tree.", (0,91), None))
1542
        self.create_hook(HookPoint('post_commit',
1543
            "Called in the bzr client after a commit has completed. "
1544
            "post_commit is called with (local, master, old_revno, old_revid, "
1545
            "new_revno, new_revid). old_revid is NULL_REVISION for the first "
1546
            "commit to a branch.", (0, 15), None))
1547
        self.create_hook(HookPoint('post_uncommit',
1548
            "Called in the bzr client after an uncommit completes. "
1549
            "post_uncommit is called with (local, master, old_revno, "
1550
            "old_revid, new_revno, new_revid) where local is the local branch "
1551
            "or None, master is the target branch, and an empty branch "
4031.3.2 by Matt Nordhoff
Merge bzr.dev, fixing conflicts.
1552
            "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.
1553
        self.create_hook(HookPoint('pre_change_branch_tip',
1554
            "Called in bzr client and server before a change to the tip of a "
1555
            "branch is made. pre_change_branch_tip is called with a "
1556
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1557
            "commit, uncommit will all trigger this hook.", (1, 6), None))
1558
        self.create_hook(HookPoint('post_change_branch_tip',
1559
            "Called in bzr client and server after a change to the tip of a "
1560
            "branch is made. post_change_branch_tip is called with a "
1561
            "bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1562
            "commit, uncommit will all trigger this hook.", (1, 4), None))
1563
        self.create_hook(HookPoint('transform_fallback_location',
1564
            "Called when a stacked branch is activating its fallback "
1565
            "locations. transform_fallback_location is called with (branch, "
1566
            "url), and should return a new url. Returning the same url "
1567
            "allows it to be used as-is, returning a different one can be "
1568
            "used to cause the branch to stack on a closer copy of that "
1569
            "fallback_location. Note that the branch cannot have history "
1570
            "accessing methods called on it during this hook because the "
1571
            "fallback locations have not been activated. When there are "
1572
            "multiple hooks installed for transform_fallback_location, "
1573
            "all are called with the url returned from the previous hook."
1574
            "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.
1575
1576
1577
# install the default hooks into the Branch class.
1578
Branch.hooks = BranchHooks()
1579
1580
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1581
class ChangeBranchTipParams(object):
1582
    """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()
1583
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1584
    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()
1585
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1586
    :ivar branch: the branch being changed
1587
    :ivar old_revno: revision number before the change
1588
    :ivar new_revno: revision number after the change
1589
    :ivar old_revid: revision id before the change
1590
    :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()
1591
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1592
    The revid fields are strings. The revno fields are integers.
1593
    """
1594
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1595
    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
1596
        """Create a group of ChangeBranchTip parameters.
1597
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1598
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1599
        :param old_revno: Revision number before the change.
1600
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1601
        :param old_revid: Tip revision id before the change.
1602
        :param new_revid: Tip revision id after the change.
1603
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1604
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1605
        self.old_revno = old_revno
1606
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1607
        self.old_revid = old_revid
1608
        self.new_revid = new_revid
1609
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1610
    def __eq__(self, other):
1611
        return self.__dict__ == other.__dict__
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1612
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1613
    def __repr__(self):
1614
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1615
            self.__class__.__name__, self.branch,
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1616
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1617
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1618
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1619
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1620
    """Bzr branch format 4.
1621
1622
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1623
     - 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.
1624
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1625
    """
1626
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1627
    def get_format_description(self):
1628
        """See BranchFormat.get_format_description()."""
1629
        return "Branch format 4"
1630
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1631
    def initialize(self, a_bzrdir):
1632
        """Create a branch of this format in a_bzrdir."""
1633
        utf8_files = [('revision-history', ''),
1634
                      ('branch-name', ''),
1635
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1636
        return self._initialize_helper(a_bzrdir, utf8_files,
1637
                                       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.
1638
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1639
    def __init__(self):
1640
        super(BzrBranchFormat4, self).__init__()
1641
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1642
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1643
    def network_name(self):
1644
        """The network name for this format is the control dirs disk label."""
1645
        return self._matchingbzrdir.get_format_string()
1646
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1647
    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1648
        """See BranchFormat.open()."""
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1649
        if not _found:
1650
            # we are being called directly and must probe.
1651
            raise NotImplementedError
1652
        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.
1653
                         _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.
1654
                         a_bzrdir=a_bzrdir,
1655
                         _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.
1656
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1657
    def __str__(self):
1658
        return "Bazaar-NG branch format 4"
1659
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1660
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1661
class BranchFormatMetadir(BranchFormat):
1662
    """Common logic for meta-dir based branch formats."""
1663
1664
    def _branch_class(self):
1665
        """What class to instantiate on open calls."""
1666
        raise NotImplementedError(self._branch_class)
1667
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1668
    def network_name(self):
1669
        """A simple byte string uniquely identifying this format for RPC calls.
1670
1671
        Metadir branch formats use their format string.
1672
        """
1673
        return self.get_format_string()
1674
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1675
    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1676
        """See BranchFormat.open()."""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1677
        if not _found:
1678
            format = BranchFormat.find_format(a_bzrdir)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
1679
            if format.__class__ != self.__class__:
1680
                raise AssertionError("wrong format %r found for %r" %
1681
                    (format, self))
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1682
        try:
1683
            transport = a_bzrdir.get_branch_transport(None)
1684
            control_files = lockable_files.LockableFiles(transport, 'lock',
1685
                                                         lockdir.LockDir)
1686
            return self._branch_class()(_format=self,
1687
                              _control_files=control_files,
1688
                              a_bzrdir=a_bzrdir,
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1689
                              _repository=a_bzrdir.find_repository(),
1690
                              ignore_fallbacks=ignore_fallbacks)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
1691
        except errors.NoSuchFile:
1692
            raise errors.NotBranchError(path=transport.base)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1693
1694
    def __init__(self):
1695
        super(BranchFormatMetadir, self).__init__()
1696
        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.
1697
        self._matchingbzrdir.set_branch_format(self)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1698
1699
    def supports_tags(self):
1700
        return True
1701
1702
1703
class BzrBranchFormat5(BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1704
    """Bzr branch format 5.
1705
1706
    This format has:
1707
     - a revision-history file.
1708
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1709
     - a lock dir guarding the branch itself
1710
     - 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.
1711
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1712
1713
    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.
1714
    """
1715
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1716
    def _branch_class(self):
1717
        return BzrBranch5
1718
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1719
    def get_format_string(self):
1720
        """See BranchFormat.get_format_string()."""
1721
        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
1722
1723
    def get_format_description(self):
1724
        """See BranchFormat.get_format_description()."""
1725
        return "Branch format 5"
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1726
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1727
    def initialize(self, a_bzrdir):
1728
        """Create a branch of this format in a_bzrdir."""
1729
        utf8_files = [('revision-history', ''),
1730
                      ('branch-name', ''),
1731
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1732
        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.
1733
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1734
    def supports_tags(self):
1735
        return False
1736
1737
1738
class BzrBranchFormat6(BranchFormatMetadir):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1739
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1740
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1741
    Unlike previous formats, this has no explicit revision history. Instead,
1742
    this just stores the last-revision, and the left-hand history leading
1743
    up to there is the history.
1744
1745
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1746
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
1747
    """
1748
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1749
    def _branch_class(self):
1750
        return BzrBranch6
1751
2230.3.1 by Aaron Bentley
Get branch6 creation working
1752
    def get_format_string(self):
1753
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1754
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
1755
1756
    def get_format_description(self):
1757
        """See BranchFormat.get_format_description()."""
1758
        return "Branch format 6"
1759
1760
    def initialize(self, a_bzrdir):
1761
        """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
1762
        utf8_files = [('last-revision', '0 null:\n'),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1763
                      ('branch.conf', ''),
1764
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1765
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1766
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1767
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.
1768
    def make_tags(self, branch):
1769
        """See bzrlib.branch.BranchFormat.make_tags()."""
1770
        return BasicTags(branch)
1771
1772
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1773
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
1774
class BzrBranchFormat8(BranchFormatMetadir):
1775
    """Metadir format supporting storing locations of subtree branches."""
1776
1777
    def _branch_class(self):
1778
        return BzrBranch8
1779
1780
    def get_format_string(self):
1781
        """See BranchFormat.get_format_string()."""
1782
        return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
1783
1784
    def get_format_description(self):
1785
        """See BranchFormat.get_format_description()."""
1786
        return "Branch format 8"
1787
1788
    def initialize(self, a_bzrdir):
1789
        """Create a branch of this format in a_bzrdir."""
1790
        utf8_files = [('last-revision', '0 null:\n'),
1791
                      ('branch.conf', ''),
1792
                      ('tags', ''),
1793
                      ('references', '')
1794
                      ]
1795
        return self._initialize_helper(a_bzrdir, utf8_files)
1796
1797
    def __init__(self):
1798
        super(BzrBranchFormat8, self).__init__()
1799
        self._matchingbzrdir.repository_format = \
1800
            RepositoryFormatKnitPack5RichRoot()
1801
1802
    def make_tags(self, branch):
1803
        """See bzrlib.branch.BranchFormat.make_tags()."""
1804
        return BasicTags(branch)
1805
1806
    def supports_stacking(self):
1807
        return True
1808
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
1809
    supports_reference_locations = True
1810
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
1811
1812
class BzrBranchFormat7(BzrBranchFormat8):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1813
    """Branch format with last-revision, tags, and a stacked location pointer.
1814
1815
    The stacked location pointer is passed down to the repository and requires
1816
    a repository format with supports_external_lookups = True.
1817
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
1818
    This format was introduced in bzr 1.6.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1819
    """
1820
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
1821
    def initialize(self, a_bzrdir):
1822
        """Create a branch of this format in a_bzrdir."""
1823
        utf8_files = [('last-revision', '0 null:\n'),
1824
                      ('branch.conf', ''),
1825
                      ('tags', ''),
1826
                      ]
1827
        return self._initialize_helper(a_bzrdir, utf8_files)
1828
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1829
    def _branch_class(self):
1830
        return BzrBranch7
1831
1832
    def get_format_string(self):
1833
        """See BranchFormat.get_format_string()."""
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
1834
        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1835
1836
    def get_format_description(self):
1837
        """See BranchFormat.get_format_description()."""
1838
        return "Branch format 7"
1839
4273.1.5 by Aaron Bentley
Ensure references are propagated by sprout/clone.
1840
    supports_reference_locations = False
1841
2230.3.1 by Aaron Bentley
Get branch6 creation working
1842
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.
1843
class BranchReferenceFormat(BranchFormat):
1844
    """Bzr branch reference format.
1845
1846
    Branch references are used in implementing checkouts, they
1847
    act as an alias to the real branch which is at some other url.
1848
1849
    This format has:
1850
     - A location file
1851
     - a format string
1852
    """
1853
1854
    def get_format_string(self):
1855
        """See BranchFormat.get_format_string()."""
1856
        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
1857
1858
    def get_format_description(self):
1859
        """See BranchFormat.get_format_description()."""
1860
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1861
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1862
    def get_reference(self, a_bzrdir):
1863
        """See BranchFormat.get_reference()."""
1864
        transport = a_bzrdir.get_branch_transport(None)
1865
        return transport.get('location').read()
1866
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1867
    def set_reference(self, a_bzrdir, to_branch):
1868
        """See BranchFormat.set_reference()."""
1869
        transport = a_bzrdir.get_branch_transport(None)
1870
        location = transport.put_bytes('location', to_branch.base)
1871
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.
1872
    def initialize(self, a_bzrdir, target_branch=None):
1873
        """Create a branch of this format in a_bzrdir."""
1874
        if target_branch is None:
1875
            # this format does not implement branch itself, thus the implicit
1876
            # creation contract must see it as uninitializable
1877
            raise errors.UninitializableFormat(self)
1878
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1879
        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
1880
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1881
            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
1882
        branch_transport.put_bytes('format', self.get_format_string())
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1883
        return self.open(
1884
            a_bzrdir, _found=True,
1885
            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.
1886
1887
    def __init__(self):
1888
        super(BranchReferenceFormat, self).__init__()
1889
        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.
1890
        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.
1891
1892
    def _make_reference_clone_function(format, a_branch):
1893
        """Create a clone() routine for a branch dynamically."""
4050.1.3 by Robert Collins
Add missed new parameter for branch reference cloning.
1894
        def clone(to_bzrdir, revision_id=None,
1895
            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.
1896
            """See Branch.clone()."""
1897
            return format.initialize(to_bzrdir, a_branch)
1898
            # cannot obey revision_id limits when cloning a reference ...
1899
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1900
            # emit some sort of warning/error to the caller ?!
1901
        return clone
1902
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1903
    def open(self, a_bzrdir, _found=False, location=None,
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1904
             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.
1905
        """Return the branch that the branch reference in a_bzrdir points at.
1906
4160.2.12 by Andrew Bennetts
Improve docstrings and remove a line of cruft.
1907
        :param a_bzrdir: A BzrDir that contains a branch.
1908
        :param _found: a private parameter, do not use it. It is used to
1909
            indicate if format probing has already be done.
1910
        :param ignore_fallbacks: when set, no fallback branches will be opened
1911
            (if there are any).  Default is to open fallbacks.
1912
        :param location: The location of the referenced branch.  If
1913
            unspecified, this will be determined from the branch reference in
1914
            a_bzrdir.
1915
        :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.
1916
        """
1917
        if not _found:
1918
            format = BranchFormat.find_format(a_bzrdir)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1919
            if format.__class__ != self.__class__:
1920
                raise AssertionError("wrong format %r found for %r" %
1921
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1922
        if location is None:
1923
            location = self.get_reference(a_bzrdir)
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1924
        real_bzrdir = bzrdir.BzrDir.open(
1925
            location, possible_transports=possible_transports)
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1926
        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.
1927
        # this changes the behaviour of result.clone to create a new reference
1928
        # rather than a copy of the content of the branch.
1929
        # I did not use a proxy object because that needs much more extensive
1930
        # testing, and we are only changing one behaviour at the moment.
1931
        # If we decide to alter more behaviours - i.e. the implicit nickname
1932
        # then this should be refactored to introduce a tested proxy branch
1933
        # and a subclass of that for use in overriding clone() and ....
1934
        # - RBC 20060210
1935
        result.clone = self._make_reference_clone_function(result)
1936
        return result
1937
1938
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1939
network_format_registry = registry.FormatRegistry()
1940
"""Registry of formats indexed by their network name.
1941
4070.2.1 by Robert Collins
Add a BzrDirFormat.network_name.
1942
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.
1943
referring to formats with smart server operations. See
1944
BranchFormat.network_name() for more detail.
1945
"""
1946
1947
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1948
# formats which have no format string are not discoverable
1949
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1950
__format5 = BzrBranchFormat5()
1951
__format6 = BzrBranchFormat6()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1952
__format7 = BzrBranchFormat7()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
1953
__format8 = BzrBranchFormat8()
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1954
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.
1955
BranchFormat.register_format(BranchReferenceFormat())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1956
BranchFormat.register_format(__format6)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1957
BranchFormat.register_format(__format7)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
1958
BranchFormat.register_format(__format8)
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1959
BranchFormat.set_default_format(__format6)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1960
_legacy_formats = [BzrBranchFormat4(),
4032.3.1 by Robert Collins
Add a BranchFormat.network_name() method as preparation for creating branches via RPC calls.
1961
    ]
1962
network_format_registry.register(
4075.2.1 by Robert Collins
Audit and make sure we are registering network_name's as factories, not instances.
1963
    _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.
1964
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1965
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1966
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1967
    """A branch stored in the actual filesystem.
1968
1969
    Note that it's "local" in the context of the filesystem; it doesn't
1970
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1971
    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
1972
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1973
    :ivar _transport: Transport for file operations on this branch's
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
1974
        control files, typically pointing to the .bzr/branch directory.
1975
    :ivar repository: Repository for this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1976
    :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
1977
        containing the .bzr directory.
1 by mbp at sourcefrog
import from baz patch-364
1978
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1979
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1980
    def __init__(self, _format=None,
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
1981
                 _control_files=None, a_bzrdir=None, _repository=None,
1982
                 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)
1983
        """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.
1984
        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)
1985
            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.
1986
        else:
1987
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1988
        self._base = self.bzrdir.transport.clone('..').base
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1989
        # XXX: We should be able to just do
1990
        #   self.base = self.bzrdir.root_transport.base
1991
        # but this does not quite work yet -- mbp 20080522
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1992
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1993
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1994
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1995
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1996
        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.
1997
        self.repository = _repository
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
1998
        Branch.__init__(self)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1999
1 by mbp at sourcefrog
import from baz patch-364
2000
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
2001
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
2002
2003
    __repr__ = __str__
2004
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2005
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
2006
        """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
2007
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
2008
1442.1.5 by Robert Collins
Give branch.base a docstring.
2009
    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,
2010
4226.1.5 by Robert Collins
Reinstate the use of the Branch.get_config_file verb.
2011
    def _get_config(self):
2012
        return TransportConfig(self._transport, 'branch.conf')
2013
1694.2.6 by Martin Pool
[merge] bzr.dev
2014
    def is_locked(self):
2015
        return self.control_files.is_locked()
2016
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).
2017
    def lock_write(self, token=None):
4288.1.12 by Robert Collins
Review feedback.
2018
        # 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.
2019
        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).
2020
        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.
2021
            self.repository.lock_write()
2022
            took_lock = True
2023
        else:
2024
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2025
        try:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2026
            return self.control_files.lock_write(token=token)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2027
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2028
            if took_lock:
2029
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2030
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2031
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
2032
    def lock_read(self):
4288.1.12 by Robert Collins
Review feedback.
2033
        # 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.
2034
        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).
2035
        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.
2036
            self.repository.lock_read()
2037
            took_lock = True
2038
        else:
2039
            took_lock = False
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2040
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
2041
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2042
        except:
4288.1.10 by Robert Collins
Fix up lock correctness to deal with adding fallback repositories to locked branch objects.
2043
            if took_lock:
2044
                self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
2045
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
2046
2047
    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).
2048
        try:
2049
            self.control_files.unlock()
2050
        finally:
4288.1.12 by Robert Collins
Review feedback.
2051
            # 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).
2052
            repo_control = getattr(self.repository, 'control_files', None)
2053
            if (self.control_files == repo_control or
2054
                not self.control_files.is_locked()):
2055
                self.repository.unlock()
2056
            if not self.control_files.is_locked():
2057
                # we just released the lock
2058
                self._clear_cached_state()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2059
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
2060
    def peek_lock_mode(self):
2061
        if self.control_files._lock_count == 0:
2062
            return None
2063
        else:
2064
            return self.control_files._lock_mode
2065
1694.2.6 by Martin Pool
[merge] bzr.dev
2066
    def get_physical_lock_status(self):
2067
        return self.control_files.get_physical_lock_status()
2068
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
2069
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
2070
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2071
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2072
        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.
2073
2230.3.49 by Aaron Bentley
Fix cache updating
2074
    def _write_revision_history(self, history):
2075
        """Factored out of set_revision_history.
2076
2077
        This performs the actual writing to disk.
2078
        It is intended to be called by BzrBranch5.set_revision_history."""
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2079
        self._transport.put_bytes(
2080
            'revision-history', '\n'.join(history),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2081
            mode=self.bzrdir._get_file_mode())
2230.3.49 by Aaron Bentley
Fix cache updating
2082
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
2083
    @needs_write_lock
2084
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2085
        """See Branch.set_revision_history."""
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
2086
        if 'evil' in debug.debug_flags:
2087
            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.
2088
        check_not_reserved_id = _mod_revision.check_not_reserved_id
2089
        for rev_id in rev_history:
2090
            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().
2091
        if Branch.hooks['post_change_branch_tip']:
2092
            # Don't calculate the last_revision_info() if there are no hooks
2093
            # that will use it.
2094
            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.
2095
        if len(rev_history) == 0:
2096
            revid = _mod_revision.NULL_REVISION
2097
        else:
2098
            revid = rev_history[-1]
2099
        self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2230.3.49 by Aaron Bentley
Fix cache updating
2100
        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.
2101
        self._clear_cached_state()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
2102
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
2103
        for hook in Branch.hooks['set_rh']:
2104
            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().
2105
        if Branch.hooks['post_change_branch_tip']:
2106
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
233 by mbp at sourcefrog
- more output from test.sh
2107
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.
2108
    def _synchronize_history(self, destination, revision_id):
2109
        """Synchronize last revision and revision history between branches.
2110
2111
        This version is most efficient when the destination is also a
2112
        BzrBranch5, but works for BzrBranch6 as long as the revision
2113
        history is the true lefthand parent history, and all of the revisions
2114
        are in the destination's repository.  If not, set_revision_history
2115
        will fail.
2116
2117
        :param destination: The branch to copy the history into
2118
        :param revision_id: The revision-id to truncate history at.  May
2119
          be None to copy complete history.
2120
        """
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.
2121
        if not isinstance(destination._format, BzrBranchFormat5):
2122
            super(BzrBranch, self)._synchronize_history(
2123
                destination, revision_id)
2124
            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.
2125
        if revision_id == _mod_revision.NULL_REVISION:
2126
            new_history = []
2127
        else:
2128
            new_history = self.revision_history()
2129
        if revision_id is not None and new_history != []:
2130
            try:
2131
                new_history = new_history[:new_history.index(revision_id) + 1]
2132
            except ValueError:
2133
                rev = self.repository.get_revision(revision_id)
2134
                new_history = rev.get_history(self.repository)[1:]
2135
        destination.set_revision_history(new_history)
2136
2230.3.5 by Aaron Bentley
implement set_last revision and clone
2137
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2138
    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
2139
        """Set the last revision of this branch.
2140
2141
        The caller is responsible for checking that the revno is correct
2142
        for this revision id.
2143
2144
        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
2145
        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
2146
        configured to check constraints on history, in which case this may not
2147
        be permitted.
2148
        """
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
2149
        revision_id = _mod_revision.ensure_null(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2150
        # this old format stores the full history, but this api doesn't
2151
        # provide it, so we must generate, and might as well check it's
2152
        # correct
2697.2.5 by Martin Pool
Kill off append_revision
2153
        history = self._lefthand_history(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2154
        if len(history) != revno:
2155
            raise AssertionError('%d != %d' % (len(history), revno))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2156
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
2157
2230.4.1 by Aaron Bentley
Get log as fast branch5
2158
    def _gen_revision_history(self):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2159
        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.
2160
        if history[-1:] == ['']:
2161
            # There shouldn't be a trailing newline, but just in case.
2162
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
2163
        return history
2164
2230.3.2 by Aaron Bentley
Get all branch tests passing
2165
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2166
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
2167
        other_branch=None):
2168
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
2169
2230.3.2 by Aaron Bentley
Get all branch tests passing
2170
        :param revision_id: the new tip to use.
2171
        :param last_rev: The previous last_revision. If not None, then this
2172
            must be a ancestory of revision_id, or DivergedBranches is raised.
2173
        :param other_branch: The other branch that DivergedBranches should
2174
            raise with respect to.
2175
        """
2176
        self.set_revision_history(self._lefthand_history(revision_id,
2177
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
2178
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2179
    def basis_tree(self):
2180
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2181
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
2182
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2183
    def _get_parent_location(self):
2184
        _locs = ['parent', 'pull', 'x-pull']
2185
        for l in _locs:
2186
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
2187
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
2188
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2189
                pass
2190
        return None
2191
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
2192
    def _basic_push(self, target, overwrite, stop_revision):
2193
        """Basic implementation of push without bound branches or hooks.
2194
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2195
        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
2196
        """
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
2197
        result = BranchPushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2198
        result.source_branch = self
2199
        result.target_branch = target
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
2200
        result.old_revno, result.old_revid = target.last_revision_info()
4273.1.8 by Aaron Bentley
Handle references in push, pull, merge.
2201
        self.update_references(target)
3703.3.1 by Andrew Bennetts
Skip unnecessary work in BzrBranch._basic_push.
2202
        if result.old_revid != self.last_revision():
2203
            # We assume that during 'push' this repository is closer than
2204
            # the target.
2205
            graph = self.repository.get_graph(target.repository)
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
2206
            target.update_revisions(self, stop_revision,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2207
                overwrite=overwrite, graph=graph)
3703.3.5 by Andrew Bennetts
Allow subclasses to control if _basic_push can skip tag merging.
2208
        if self._push_should_merge_tags():
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
2209
            result.tag_conflicts = self.tags.merge_to(target.tags,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
2210
                overwrite)
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
2211
        result.new_revno, result.new_revid = target.last_revision_info()
2212
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
2213
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2214
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2215
        raise errors.UnstackableBranchFormat(self._format, self.base)
2216
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2217
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
2218
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
2219
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
2220
            'push_location', location,
2221
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
2222
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2223
    def _set_parent_location(self, url):
2224
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2225
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2226
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2227
            self._transport.put_bytes('parent', url + '\n',
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2228
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
2229
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2230
2231
class BzrBranch5(BzrBranch):
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2232
    """A format 5 branch. This supports new features over plain branches.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2233
2234
    It has support for a master_branch which is the data for bound branches.
2235
    """
2236
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2237
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2238
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
2239
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2240
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2241
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2242
2243
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2244
    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
2245
        """Return the branch we are bound to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2246
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2247
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2248
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
2249
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2250
        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.
2251
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2252
        # 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
2253
        """
2254
        bound_loc = self.get_bound_location()
2255
        if not bound_loc:
2256
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2257
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2258
            return Branch.open(bound_loc,
2259
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
2260
        except (errors.NotBranchError, errors.ConnectionError), e:
2261
            raise errors.BoundBranchConnectionFailure(
2262
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2263
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2264
    @needs_write_lock
2265
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
2266
        """Set the target where this branch is bound to.
2267
2268
        :param location: URL to the target branch
2269
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
2270
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
2271
            self._transport.put_bytes('bound', location+'\n',
2272
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
2273
        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.
2274
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2275
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
2276
            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.
2277
                return False
2278
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2279
2280
    @needs_write_lock
2281
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
2282
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2283
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
2284
        This does not push or pull data between the branches, though it does
2285
        check for divergence to raise an error when the branches are not
2286
        either the same, or one a prefix of the other. That behaviour may not
2287
        be useful, so that check may be removed in future.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2288
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2289
        :param other: The branch to bind to
2290
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
2291
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
2292
        # TODO: jam 20051230 Consider checking if the target is bound
2293
        #       It is debatable whether you should be able to bind to
2294
        #       a branch which is itself bound.
2295
        #       Committing is obviously forbidden,
2296
        #       but binding itself may not be.
2297
        #       Since we *have* to check at commit time, we don't
2298
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
2299
2300
        # we want to raise diverged if:
2301
        # last_rev is not in the other_last_rev history, AND
2302
        # other_last_rev is not in our history, and do it without pulling
2303
        # history around
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2304
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2305
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
2306
    @needs_write_lock
2307
    def unbind(self):
2308
        """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.
2309
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2310
1587.1.10 by Robert Collins
update updates working tree and branch together.
2311
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2312
    def update(self, possible_transports=None):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2313
        """Synchronise this branch with the master branch if any.
1587.1.10 by Robert Collins
update updates working tree and branch together.
2314
2315
        :return: None or the last_revision that was pivoted out during the
2316
                 update.
2317
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2318
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
2319
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2320
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
2321
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2322
            if self.repository.get_graph().is_ancestor(old_tip,
2323
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
2324
                return None
2325
            return old_tip
2326
        return None
2327
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
2328
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2329
class BzrBranch8(BzrBranch5):
2330
    """A branch that stores tree-reference locations."""
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2331
2332
    def _open_hook(self):
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
2333
        if self._ignore_fallbacks:
2334
            return
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2335
        try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2336
            url = self.get_stacked_on_url()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2337
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2338
            errors.UnstackableBranchFormat):
2339
            pass
2340
        else:
3770.2.1 by Michael Hudson
test and feature
2341
            for hook in Branch.hooks['transform_fallback_location']:
2342
                url = hook(self, url)
3770.2.3 by Michael Hudson
check for None being returned for a hook
2343
                if url is None:
2344
                    hook_name = Branch.hooks.get_hook_name(hook)
2345
                    raise AssertionError(
2346
                        "'transform_fallback_location' hook %s returned "
2347
                        "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.
2348
            self._activate_fallback_location(url, None)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2349
4160.2.8 by Andrew Bennetts
Slightly less messy BzrBranch7.__init__.
2350
    def __init__(self, *args, **kwargs):
2351
        self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2352
        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.
2353
        self._last_revision_info_cache = None
3298.2.10 by Aaron Bentley
Refactor partial history code
2354
        self._partial_revision_history_cache = []
4273.1.15 by Aaron Bentley
Add reference_info caching.
2355
        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.
2356
2357
    def _clear_cached_state(self):
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2358
        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.
2359
        self._last_revision_info_cache = None
3298.2.10 by Aaron Bentley
Refactor partial history code
2360
        self._partial_revision_history_cache = []
4273.1.15 by Aaron Bentley
Add reference_info caching.
2361
        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.
2362
3298.2.10 by Aaron Bentley
Refactor partial history code
2363
    def _last_revision_info(self):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2364
        revision_string = self._transport.get_bytes('last-revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
2365
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2366
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2367
        revno = int(revno)
2368
        return revno, revision_id
2369
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2370
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
2371
        """Simply write out the revision id, with no checks.
2372
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2373
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
2374
2375
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2376
        Intended to be called by set_last_revision_info and
2377
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
2378
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2379
        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
2380
        out_string = '%d %s\n' % (revno, revision_id)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2381
        self._transport.put_bytes('last-revision', out_string,
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2382
            mode=self.bzrdir._get_file_mode())
2230.3.2 by Aaron Bentley
Get all branch tests passing
2383
2230.3.49 by Aaron Bentley
Fix cache updating
2384
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2385
    def set_last_revision_info(self, revno, revision_id):
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
2386
        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.
2387
        old_revno, old_revid = self.last_revision_info()
2230.3.49 by Aaron Bentley
Fix cache updating
2388
        if self._get_append_revisions_only():
2389
            self._check_history_violation(revision_id)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
2390
        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
2391
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
2392
        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.
2393
        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.
2394
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.3.49 by Aaron Bentley
Fix cache updating
2395
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.
2396
    def _synchronize_history(self, destination, revision_id):
2397
        """Synchronize last revision and revision history between branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2398
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.
2399
        :see: Branch._synchronize_history
2400
        """
2401
        # XXX: The base Branch has a fast implementation of this method based
2402
        # on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2403
        # that uses set_revision_history.  This class inherits from BzrBranch5,
2404
        # but wants the fast implementation, so it calls
2405
        # Branch._synchronize_history directly.
2406
        Branch._synchronize_history(self, destination, revision_id)
2407
2230.3.32 by Aaron Bentley
Implement strict history policy
2408
    def _check_history_violation(self, revision_id):
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2409
        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
2410
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
2411
            return
2412
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2413
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
2414
2230.4.1 by Aaron Bentley
Get log as fast branch5
2415
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2416
        """Generate the revision history from last revision
2417
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2418
        last_revno, last_revision = self.last_revision_info()
2419
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2420
        return list(reversed(self._partial_revision_history_cache))
2421
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2422
    def _extend_partial_history(self, stop_index=None, stop_revision=None):
3298.2.10 by Aaron Bentley
Refactor partial history code
2423
        """Extend the partial history to include a given index
2424
3298.3.1 by Aaron Bentley
Make stop_revision optional for extend_partial_history
2425
        If a stop_index is supplied, stop when that index has been reached.
3298.2.17 by Aaron Bentley
Update from review
2426
        If a stop_revision is supplied, stop when that revision is
2427
        encountered.  Otherwise, stop when the beginning of history is
2428
        reached.
3298.2.10 by Aaron Bentley
Refactor partial history code
2429
3298.2.17 by Aaron Bentley
Update from review
2430
        :param stop_index: The index which should be present.  When it is
2431
            present, history extension will stop.
2432
        :param revision_id: The revision id which should be present.  When
2433
            it is encountered, history extension will stop.
3298.2.10 by Aaron Bentley
Refactor partial history code
2434
        """
2435
        repo = self.repository
2436
        if len(self._partial_revision_history_cache) == 0:
2437
            iterator = repo.iter_reverse_revision_history(self.last_revision())
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2438
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2439
            start_revision = self._partial_revision_history_cache[-1]
2440
            iterator = repo.iter_reverse_revision_history(start_revision)
2441
            #skip the last revision in the list
3298.3.3 by Aaron Bentley
Update from review
2442
            next_revision = iterator.next()
3298.2.10 by Aaron Bentley
Refactor partial history code
2443
        for revision_id in iterator:
2444
            self._partial_revision_history_cache.append(revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2445
            if (stop_index is not None and
2446
                len(self._partial_revision_history_cache) > stop_index):
2447
                break
2448
            if revision_id == stop_revision:
3298.2.10 by Aaron Bentley
Refactor partial history code
2449
                break
2230.3.2 by Aaron Bentley
Get all branch tests passing
2450
2230.3.49 by Aaron Bentley
Fix cache updating
2451
    def _write_revision_history(self, history):
2452
        """Factored out of set_revision_history.
2453
2454
        This performs the actual writing to disk, with format-specific checks.
2455
        It is intended to be called by BzrBranch5.set_revision_history.
2456
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
2457
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
2458
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
2459
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2460
            if history != self._lefthand_history(history[-1]):
2461
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
2462
            last_revision = history[-1]
2463
        if self._get_append_revisions_only():
2464
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2465
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2466
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2467
    @needs_write_lock
2468
    def _set_parent_location(self, url):
2469
        """Set the parent branch"""
2470
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2471
2472
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2473
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2474
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2475
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2476
4273.1.15 by Aaron Bentley
Add reference_info caching.
2477
    @needs_write_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2478
    def _set_all_reference_info(self, info_dict):
2479
        """Replace all reference info stored in a branch.
2480
2481
        :param info_dict: A dict of {file_id: (tree_path, branch_location)}
2482
        """
2483
        s = StringIO()
2484
        writer = rio.RioWriter(s)
2485
        for key, (tree_path, branch_location) in info_dict.iteritems():
2486
            stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2487
                                branch_location=branch_location)
2488
            writer.write_stanza(stanza)
2489
        self._transport.put_bytes('references', s.getvalue())
4273.1.15 by Aaron Bentley
Add reference_info caching.
2490
        self._reference_info = info_dict
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2491
4273.1.15 by Aaron Bentley
Add reference_info caching.
2492
    @needs_read_lock
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2493
    def _get_all_reference_info(self):
2494
        """Return all the reference info stored in a branch.
2495
2496
        :return: A dict of {file_id: (tree_path, branch_location)}
2497
        """
4273.1.15 by Aaron Bentley
Add reference_info caching.
2498
        if self._reference_info is not None:
2499
            return self._reference_info
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2500
        rio_file = self._transport.get('references')
2501
        try:
2502
            stanzas = rio.read_stanzas(rio_file)
2503
            info_dict = dict((s['file_id'], (s['tree_path'],
2504
                             s['branch_location'])) for s in stanzas)
2505
        finally:
2506
            rio_file.close()
4273.1.15 by Aaron Bentley
Add reference_info caching.
2507
        self._reference_info = info_dict
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2508
        return info_dict
2509
2510
    def set_reference_info(self, file_id, tree_path, branch_location):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2511
        """Set the branch location to use for a tree reference.
2512
2513
        :param file_id: The file-id of the tree reference.
2514
        :param tree_path: The path of the tree reference in the tree.
2515
        :param branch_location: The location of the branch to retrieve tree
2516
            references from.
2517
        """
2518
        info_dict = self._get_all_reference_info()
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2519
        info_dict[file_id] = (tree_path, branch_location)
2520
        if None in (tree_path, branch_location):
2521
            if tree_path is not None:
2522
                raise ValueError('tree_path must be None when branch_location'
2523
                                 ' is None.')
2524
            if branch_location is not None:
2525
                raise ValueError('branch_location must be None when tree_path'
2526
                                 ' is None.')
2527
            del info_dict[file_id]
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2528
        self._set_all_reference_info(info_dict)
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2529
2530
    def get_reference_info(self, file_id):
4273.1.11 by Aaron Bentley
Clean up naming and docstrings
2531
        """Get the tree_path and branch_location for a tree reference.
2532
2533
        :return: a tuple of (tree_path, branch_location)
2534
        """
2535
        return self._get_all_reference_info().get(file_id, (None, None))
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2536
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2537
    def reference_parent(self, file_id, path, possible_transports=None):
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2538
        """Return the parent branch for a tree-reference file_id.
2539
2540
        :param file_id: The file_id of the tree reference
2541
        :param path: The path of the file_id in the tree
2542
        :return: A branch associated with the file_id
2543
        """
2544
        branch_location = self.get_reference_info(file_id)[1]
2545
        if branch_location is None:
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2546
            return Branch.reference_parent(self, file_id, path,
2547
                                           possible_transports)
2548
        branch_location = urlutils.join(self.base, branch_location)
2549
        return Branch.open(branch_location,
2550
                           possible_transports=possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2551
2230.3.3 by Aaron Bentley
Add more config testing
2552
    def set_push_location(self, location):
2553
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2554
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2555
2556
    def set_bound_location(self, location):
2557
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
2558
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2559
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2560
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2561
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2562
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2563
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2564
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2565
                return True
2566
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2567
            self._set_config_location('bound_location', location,
2568
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2569
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2570
        return True
2571
2572
    def _get_bound_location(self, bound):
2573
        """Return the bound location in the config file.
2574
2575
        Return None if the bound parameter does not match"""
2576
        config = self.get_config()
2577
        config_bound = (config.get_user_option('bound') == 'True')
2578
        if config_bound != bound:
2579
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2580
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2581
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2582
    def get_bound_location(self):
2583
        """See Branch.set_push_location."""
2584
        return self._get_bound_location(True)
2585
2586
    def get_old_bound_location(self):
2587
        """See Branch.get_old_bound_location"""
2588
        return self._get_bound_location(False)
2589
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2590
    def get_stacked_on_url(self):
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2591
        # you can always ask for the URL; but you might not be able to use it
2592
        # if the repo can't support stacking.
2593
        ## self._check_stackable_repo()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2594
        stacked_url = self._get_config_location('stacked_on_location')
2595
        if stacked_url is None:
3221.11.6 by Robert Collins
Stackable branch fixes.
2596
            raise errors.NotStacked(self)
2597
        return stacked_url
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2598
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2599
    def set_append_revisions_only(self, enabled):
2600
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2601
            value = 'True'
2602
        else:
2603
            value = 'False'
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2604
        self.get_config().set_user_option('append_revisions_only', value,
2605
            warn_masked=True)
2230.3.32 by Aaron Bentley
Implement strict history policy
2606
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2607
    def _get_append_revisions_only(self):
2608
        value = self.get_config().get_user_option('append_revisions_only')
2609
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2610
3240.1.2 by Aaron Bentley
Add write lock
2611
    @needs_write_lock
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2612
    def generate_revision_history(self, revision_id, last_rev=None,
2613
                                  other_branch=None):
3240.1.6 by Aaron Bentley
Update docs
2614
        """See BzrBranch5.generate_revision_history"""
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2615
        history = self._lefthand_history(revision_id, last_rev, other_branch)
2616
        revno = len(history)
2617
        self.set_last_revision_info(revno, revision_id)
2618
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
2619
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2620
    def get_rev_id(self, revno, history=None):
2621
        """Find the revision id of the specified revno."""
2622
        if revno == 0:
2623
            return _mod_revision.NULL_REVISION
2624
2625
        last_revno, last_revision_id = self.last_revision_info()
2626
        if revno <= 0 or revno > last_revno:
2627
            raise errors.NoSuchRevision(self, revno)
2628
2629
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
2630
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2631
3298.2.10 by Aaron Bentley
Refactor partial history code
2632
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
2633
        if len(self._partial_revision_history_cache) <= index:
2634
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
2635
        if len(self._partial_revision_history_cache) > index:
2636
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2637
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2638
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2639
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2640
    @needs_read_lock
2641
    def revision_id_to_revno(self, revision_id):
2642
        """Given a revision id, return its revno"""
2643
        if _mod_revision.is_null(revision_id):
2644
            return 0
2645
        try:
2646
            index = self._partial_revision_history_cache.index(revision_id)
2647
        except ValueError:
2648
            self._extend_partial_history(stop_revision=revision_id)
2649
            index = len(self._partial_revision_history_cache) - 1
2650
            if self._partial_revision_history_cache[index] != revision_id:
2651
                raise errors.NoSuchRevision(self, revision_id)
2652
        return self.revno() - index
2653
2230.3.34 by Aaron Bentley
cleanup
2654
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2655
class BzrBranch7(BzrBranch8):
2656
    """A branch with support for a fallback repository."""
2657
2658
    def set_reference_info(self, file_id, tree_path, branch_location):
2659
        Branch.set_reference_info(self, file_id, tree_path, branch_location)
2660
2661
    def get_reference_info(self, file_id):
2662
        Branch.get_reference_info(self, file_id)
2663
4273.1.4 by Aaron Bentley
Relative reference locations are branch-relative.
2664
    def reference_parent(self, file_id, path, possible_transports=None):
2665
        return Branch.reference_parent(self, file_id, path,
2666
                                       possible_transports)
4273.1.2 by Aaron Bentley
Use reference_info to get reference_parent.
2667
4273.1.1 by Aaron Bentley
Implement branch format for tree references.
2668
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2669
class BzrBranch6(BzrBranch7):
2670
    """See BzrBranchFormat6 for the capabilities of this branch.
2671
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2672
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2673
    i.e. stacking.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2674
    """
2675
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2676
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2677
        raise errors.UnstackableBranchFormat(self._format, self.base)
2678
2679
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2680
######################################################################
2681
# results of operations
2682
2220.2.37 by Martin Pool
Report conflicting tags from push.
2683
2684
class _Result(object):
2685
2686
    def _show_tag_conficts(self, to_file):
2687
        if not getattr(self, 'tag_conflicts', None):
2688
            return
2689
        to_file.write('Conflicting tags:\n')
2690
        for name, value1, value2 in self.tag_conflicts:
2691
            to_file.write('    %s\n' % (name, ))
2692
2693
2694
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2695
    """Result of a Branch.pull operation.
2696
2697
    :ivar old_revno: Revision number before pull.
2698
    :ivar new_revno: Revision number after pull.
2699
    :ivar old_revid: Tip revision id before pull.
2700
    :ivar new_revid: Tip revision id after pull.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
2701
    :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.
2702
    :ivar master_branch: Master branch of the target, or the target if no
2703
        Master
2704
    :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.
2705
    :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.
2706
    :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
2707
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2708
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2709
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2710
        # DEPRECATED: pull used to return the change in revno
2711
        return self.new_revno - self.old_revno
2712
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2713
    def report(self, to_file):
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
2714
        if not is_quiet():
2715
            if self.old_revid == self.new_revid:
2716
                to_file.write('No revisions to pull.\n')
2717
            else:
2718
                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
2719
        self._show_tag_conficts(to_file)
2720
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2721
4053.3.1 by Jelmer Vernooij
Rename PushResult to BranchPushResult.
2722
class BranchPushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2723
    """Result of a Branch.push operation.
2724
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
2725
    :ivar old_revno: Revision number (eg 10) of the target before push.
2726
    :ivar new_revno: Revision number (eg 12) of the target after push.
2727
    :ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
2728
        before the push.
2729
    :ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
2730
        after the push.
2731
    :ivar source_branch: Source branch object that the push was from. This is
2732
        read locked, and generally is a local (and thus low latency) branch.
2733
    :ivar master_branch: If target is a bound branch, the master branch of
2734
        target, or target itself. Always write locked.
2735
    :ivar target_branch: The direct Branch where data is being sent (write
2736
        locked).
2737
    :ivar local_branch: If the target is a bound branch this will be the
2738
        target, otherwise it will be None.
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2739
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2740
2741
    def __int__(self):
2742
        # 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()
2743
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2744
2220.2.37 by Martin Pool
Report conflicting tags from push.
2745
    def report(self, to_file):
2746
        """Write a human-readable description of the result."""
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2747
        if self.old_revid == self.new_revid:
3978.2.2 by Jelmer Vernooij
Write status messages during push to stderr rather than stdout.
2748
            note('No new revisions to push.')
2220.2.37 by Martin Pool
Report conflicting tags from push.
2749
        else:
3978.2.2 by Jelmer Vernooij
Write status messages during push to stderr rather than stdout.
2750
            note('Pushed up to revision %d.' % self.new_revno)
2220.2.37 by Martin Pool
Report conflicting tags from push.
2751
        self._show_tag_conficts(to_file)
2752
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2753
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2754
class BranchCheckResult(object):
2755
    """Results of checking branch consistency.
2756
2757
    :see: Branch.check
2758
    """
2759
2760
    def __init__(self, branch):
2761
        self.branch = branch
2762
2763
    def report_results(self, verbose):
2764
        """Report the check results via trace.note.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2765
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2766
        :param verbose: Requests more detailed display of what was checked,
2767
            if any.
2768
        """
2769
        note('checked branch %s format %s',
2770
             self.branch.base,
2771
             self.branch._format)
2772
2773
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2774
class Converter5to6(object):
2775
    """Perform an in-place upgrade of format 5 to format 6"""
2776
2777
    def convert(self, branch):
2778
        # Data for 5 and 6 can peacefully coexist.
2779
        format = BzrBranchFormat6()
2780
        new_branch = format.open(branch.bzrdir, _found=True)
2781
2782
        # 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.
2783
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2784
        new_branch.set_parent(branch.get_parent())
2785
        new_branch.set_bound_location(branch.get_bound_location())
2786
        new_branch.set_push_location(branch.get_push_location())
2787
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2788
        # New branch has no tags by default
2789
        new_branch.tags._set_tag_dict({})
2790
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2791
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2792
        new_branch._transport.put_bytes('format',
2793
            format.get_format_string(),
3407.2.18 by Martin Pool
BzrDir takes responsibility for default file/dir modes
2794
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2795
2796
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2797
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2798
        try:
2799
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
2800
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2801
            pass
2802
        branch.set_bound_location(None)
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
2803
2804
2805
class Converter6to7(object):
2806
    """Perform an in-place upgrade of format 6 to format 7"""
2807
2808
    def convert(self, branch):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
2809
        format = BzrBranchFormat7()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2810
        branch._set_config_location('stacked_on_location', '')
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
2811
        # update target format
3221.13.5 by Ian Clatworthy
fix LockableFiles deprecations
2812
        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()
2813
2814
4273.1.13 by Aaron Bentley
Implement upgrade from branch format 7 to 8.
2815
class Converter7to8(object):
2816
    """Perform an in-place upgrade of format 6 to format 7"""
2817
2818
    def convert(self, branch):
2819
        format = BzrBranchFormat8()
2820
        branch._transport.put_bytes('references', '')
2821
        # update target format
2822
        branch._transport.put_bytes('format', format.get_format_string())
2823
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
2824
2825
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2826
    """Run ``callable(*args, **kwargs)``, write-locking target for the
2827
    duration.
2828
2829
    _run_with_write_locked_target will attempt to release the lock it acquires.
2830
2831
    If an exception is raised by callable, then that exception *will* be
2832
    propagated, even if the unlock attempt raises its own error.  Thus
2833
    _run_with_write_locked_target should be preferred to simply doing::
2834
2835
        target.lock_write()
2836
        try:
2837
            return callable(*args, **kwargs)
2838
        finally:
2839
            target.unlock()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2840
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
2841
    """
2842
    # This is very similar to bzrlib.decorators.needs_write_lock.  Perhaps they
2843
    # should share code?
2844
    target.lock_write()
2845
    try:
2846
        result = callable(*args, **kwargs)
2847
    except:
2848
        exc_info = sys.exc_info()
2849
        try:
2850
            target.unlock()
2851
        finally:
2852
            raise exc_info[0], exc_info[1], exc_info[2]
2853
    else:
2854
        target.unlock()
2855
        return result
3978.3.1 by Jelmer Vernooij
Add InterBranchBzrDir class.
2856
2857
4000.5.1 by Jelmer Vernooij
Add InterBranch.
2858
class InterBranch(InterObject):
2859
    """This class represents operations taking place between two branches.
2860
2861
    Its instances have methods like pull() and push() and contain
2862
    references to the source and target repositories these operations
2863
    can be carried out on.
2864
    """
2865
2866
    _optimisers = []
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2867
    """The available optimised InterBranch types."""
2868
2869
    @staticmethod
2870
    def _get_branch_formats_to_test():
2871
        """Return a tuple with the Branch formats to use when testing."""
2872
        raise NotImplementedError(self._get_branch_formats_to_test)
2873
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2874
    def pull(self, overwrite=False, stop_revision=None,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2875
             possible_transports=None, local=False):
4000.5.10 by Jelmer Vernooij
Fix comment for InterBranch.pull.
2876
        """Mirror source into target branch.
2877
2878
        The target branch is considered to be 'local', having low latency.
2879
2880
        :returns: PullResult instance
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2881
        """
2882
        raise NotImplementedError(self.pull)
2883
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2884
    def update_revisions(self, stop_revision=None, overwrite=False,
2885
                         graph=None):
2886
        """Pull in new perfect-fit revisions.
2887
2888
        :param stop_revision: Updated until the given revision
2889
        :param overwrite: Always set the branch pointer, rather than checking
2890
            to see if it is a proper descendant.
2891
        :param graph: A Graph object that can be used to query history
2892
            information. This can be None.
2893
        :return: None
2894
        """
2895
        raise NotImplementedError(self.update_revisions)
2896
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
2897
    def push(self, overwrite=False, stop_revision=None,
2898
             _override_hook_source_branch=None):
2899
        """Mirror the source branch into the target branch.
2900
2901
        The source branch is considered to be 'local', having low latency.
2902
        """
2903
        raise NotImplementedError(self.push)
2904
3978.3.11 by Jelmer Vernooij
Move InterBranchBzrDir to bzrlib.push.
2905
2906
class GenericInterBranch(InterBranch):
2907
    """InterBranch implementation that uses public Branch functions.
4000.5.1 by Jelmer Vernooij
Add InterBranch.
2908
    """
2909
4000.5.3 by Jelmer Vernooij
Add tests for InterBranch.
2910
    @staticmethod
4000.5.5 by Jelmer Vernooij
Allow InterBranch implementations to set different from and to Branch formats for testing.
2911
    def _get_branch_formats_to_test():
2912
        return BranchFormat._default_format, BranchFormat._default_format
4000.5.3 by Jelmer Vernooij
Add tests for InterBranch.
2913
4000.5.1 by Jelmer Vernooij
Add InterBranch.
2914
    def update_revisions(self, stop_revision=None, overwrite=False,
2915
        graph=None):
2916
        """See InterBranch.update_revisions()."""
2917
        self.source.lock_read()
2918
        try:
2919
            other_revno, other_last_revision = self.source.last_revision_info()
2920
            stop_revno = None # unknown
2921
            if stop_revision is None:
2922
                stop_revision = other_last_revision
2923
                if _mod_revision.is_null(stop_revision):
2924
                    # if there are no commits, we're done.
2925
                    return
2926
                stop_revno = other_revno
2927
2928
            # what's the current last revision, before we fetch [and change it
2929
            # possibly]
2930
            last_rev = _mod_revision.ensure_null(self.target.last_revision())
2931
            # we fetch here so that we don't process data twice in the common
2932
            # case of having something to pull, and so that the check for
2933
            # already merged can operate on the just fetched graph, which will
2934
            # be cached in memory.
2935
            self.target.fetch(self.source, stop_revision)
2936
            # Check to see if one is an ancestor of the other
2937
            if not overwrite:
2938
                if graph is None:
2939
                    graph = self.target.repository.get_graph()
2940
                if self.target._check_if_descendant_or_diverged(
2941
                        stop_revision, last_rev, graph, self.source):
2942
                    # stop_revision is a descendant of last_rev, but we aren't
2943
                    # overwriting, so we're done.
2944
                    return
2945
            if stop_revno is None:
2946
                if graph is None:
2947
                    graph = self.target.repository.get_graph()
2948
                this_revno, this_last_revision = \
2949
                        self.target.last_revision_info()
2950
                stop_revno = graph.find_distance_to_null(stop_revision,
2951
                                [(other_last_revision, other_revno),
2952
                                 (this_last_revision, this_revno)])
2953
            self.target.set_last_revision_info(stop_revno, stop_revision)
2954
        finally:
2955
            self.source.unlock()
2956
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2957
    def pull(self, overwrite=False, stop_revision=None,
2958
             possible_transports=None, _hook_master=None, run_hooks=True,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2959
             _override_hook_target=None, local=False):
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2960
        """See Branch.pull.
2961
2962
        :param _hook_master: Private parameter - set the branch to
2963
            be supplied as the master to pull hooks.
2964
        :param run_hooks: Private parameter - if false, this branch
2965
            is being called because it's the master of the primary branch,
2966
            so it should not run its hooks.
2967
        :param _override_hook_target: Private parameter - set the branch to be
2968
            supplied as the target_branch to pull hooks.
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2969
        :param local: Only update the local branch, and not the bound branch.
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2970
        """
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
2971
        # This type of branch can't be bound.
2972
        if local:
2973
            raise errors.LocalRequiresBoundBranch()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2974
        result = PullResult()
2975
        result.source_branch = self.source
2976
        if _override_hook_target is None:
2977
            result.target_branch = self.target
2978
        else:
2979
            result.target_branch = _override_hook_target
2980
        self.source.lock_read()
2981
        try:
4000.5.10 by Jelmer Vernooij
Fix comment for InterBranch.pull.
2982
            # We assume that during 'pull' the target repository is closer than
2983
            # the source one.
4000.5.22 by Jelmer Vernooij
Fix update_references call.
2984
            self.source.update_references(self.target)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2985
            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.
2986
            # TODO: Branch formats should have a flag that indicates 
2987
            # that revno's are expensive, and pull() should honor that flag.
2988
            # -- JRV20090506
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2989
            result.old_revno, result.old_revid = \
2990
                self.target.last_revision_info()
2991
            self.target.update_revisions(self.source, stop_revision,
2992
                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.
2993
            # TODO: The old revid should be specified when merging tags, 
2994
            # so a tags implementation that versions tags can only 
2995
            # pull in the most recent changes. -- JRV20090506
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
2996
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
2997
                overwrite)
2998
            result.new_revno, result.new_revid = self.target.last_revision_info()
2999
            if _hook_master:
3000
                result.master_branch = _hook_master
3001
                result.local_branch = result.target_branch
3002
            else:
3003
                result.master_branch = result.target_branch
3004
                result.local_branch = None
3005
            if run_hooks:
3006
                for hook in Branch.hooks['post_pull']:
3007
                    hook(result)
3008
        finally:
3009
            self.source.unlock()
3010
        return result
3011
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3012
    def push(self, overwrite=False, stop_revision=None,
3013
             _override_hook_source_branch=None):
3014
        """See InterBranch.push.
3015
3016
        This is the basic concrete implementation of push()
3017
3018
        :param _override_hook_source_branch: If specified, run
3019
        the hooks passing this Branch as the source, rather than self.
3020
        This is for use of RemoteBranch, where push is delegated to the
3021
        underlying vfs-based Branch.
3022
        """
3023
        # TODO: Public option to disable running hooks - should be trivial but
3024
        # needs tests.
3025
        self.source.lock_read()
3026
        try:
3027
            return _run_with_write_locked_target(
3028
                self.target, self._push_with_bound_branches, overwrite,
3029
                stop_revision,
3030
                _override_hook_source_branch=_override_hook_source_branch)
3031
        finally:
3032
            self.source.unlock()
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3033
        return result
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3034
3035
    def _push_with_bound_branches(self, overwrite, stop_revision,
3036
            _override_hook_source_branch=None):
3037
        """Push from source into target, and into target's master if any.
3038
        """
3039
        def _run_hooks():
3040
            if _override_hook_source_branch:
3041
                result.source_branch = _override_hook_source_branch
3042
            for hook in Branch.hooks['post_push']:
3043
                hook(result)
3044
3045
        bound_location = self.target.get_bound_location()
3046
        if bound_location and self.target.base != bound_location:
3047
            # there is a master branch.
3048
            #
3049
            # XXX: Why the second check?  Is it even supported for a branch to
3050
            # be bound to itself? -- mbp 20070507
3051
            master_branch = self.target.get_master_branch()
3052
            master_branch.lock_write()
3053
            try:
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3054
                # push into the master from the source branch.
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3055
                self.source._basic_push(master_branch, overwrite, stop_revision)
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3056
                # and push into the target branch from the source. Note that we
3057
                # push from the source branch again, because its considered the
3058
                # highest bandwidth repository.
3059
                result = self.source._basic_push(self.target, overwrite,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3060
                    stop_revision)
3061
                result.master_branch = master_branch
3062
                result.local_branch = self.target
3063
                _run_hooks()
3064
                return result
3065
            finally:
3066
                master_branch.unlock()
3067
        else:
3068
            # no master branch
4211.1.3 by Jelmer Vernooij
Fix trailing whitespace, add prototype for InterBranch.push().
3069
            result = self.source._basic_push(self.target, overwrite,
4211.1.1 by Jelmer Vernooij
Move Branch.push to InterBranch.push.
3070
                stop_revision)
3071
            # TODO: Why set master_branch and local_branch if there's no
3072
            # binding?  Maybe cleaner to just leave them unset? -- mbp
3073
            # 20070504
3074
            result.master_branch = self.target
3075
            result.local_branch = None
3076
            _run_hooks()
3077
            return result
3078
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3079
    @classmethod
3080
    def is_compatible(self, source, target):
3081
        # GenericBranch uses the public API, so always compatible
3082
        return True
3083
3084
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3085
class InterToBranch5(GenericInterBranch):
3086
4000.5.11 by Jelmer Vernooij
Improve tests for InterBranch.pull.
3087
    @staticmethod
3088
    def _get_branch_formats_to_test():
4000.5.19 by Jelmer Vernooij
Merge improvements to interbranch tests.
3089
        return BranchFormat._default_format, BzrBranchFormat5()
4000.5.11 by Jelmer Vernooij
Improve tests for InterBranch.pull.
3090
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3091
    def pull(self, overwrite=False, stop_revision=None,
3092
             possible_transports=None, run_hooks=True,
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3093
             _override_hook_target=None, local=False):
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3094
        """Pull from source into self, updating my master if any.
3095
3096
        :param run_hooks: Private parameter - if false, this branch
3097
            is being called because it's the master of the primary branch,
3098
            so it should not run its hooks.
3099
        """
3100
        bound_location = self.target.get_bound_location()
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3101
        if local and not bound_location:
3102
            raise errors.LocalRequiresBoundBranch()
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3103
        master_branch = None
4000.5.21 by Jelmer Vernooij
Merge bzr.dev.
3104
        if not local and bound_location and self.source.base != bound_location:
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3105
            # not pulling from master, so we need to update master.
3106
            master_branch = self.target.get_master_branch(possible_transports)
3107
            master_branch.lock_write()
3108
        try:
3109
            if master_branch:
3110
                # pull from source into master.
3111
                master_branch.pull(self.source, overwrite, stop_revision,
3112
                    run_hooks=False)
3113
            return super(InterToBranch5, self).pull(overwrite,
3114
                stop_revision, _hook_master=master_branch,
3115
                run_hooks=run_hooks,
3116
                _override_hook_target=_override_hook_target)
3117
        finally:
3118
            if master_branch:
3119
                master_branch.unlock()
3120
3121
4000.5.1 by Jelmer Vernooij
Add InterBranch.
3122
InterBranch.register_optimiser(GenericInterBranch)
4000.5.9 by Jelmer Vernooij
Add InterBranch.pull().
3123
InterBranch.register_optimiser(InterToBranch5)