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