~bzr-pqm/bzr/bzr.dev

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