/brz/remove-bazaar

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