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