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