/brz/remove-bazaar

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