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