~bzr-pqm/bzr/bzr.dev

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