/brz/remove-bazaar

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