/brz/remove-bazaar

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