~bzr-pqm/bzr/bzr.dev

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