/brz/remove-bazaar

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