~bzr-pqm/bzr/bzr.dev

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