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