/brz/remove-bazaar

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