/brz/remove-bazaar

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