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