/brz/remove-bazaar

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