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