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