/brz/remove-bazaar

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