/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
158
                    config = master.get_config()
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
712
        BzrBranch5, but works for BzrBranch6 as long as the revision
713
        history is the true lefthand parent history, and all of the revisions
714
        are in the destination's repository.  If not, set_revision_history
715
        will fail.
716
717
        :param destination: The branch to copy the history into
718
        :param revision_id: The revision-id to truncate history at.  May
719
          be None to copy complete history.
720
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
721
        if revision_id == _mod_revision.NULL_REVISION:
722
            new_history = []
3650.3.3 by Aaron Bentley
fix sprout
723
        else:
724
            new_history = self.revision_history()
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
725
        if revision_id is not None and new_history != []:
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
726
            try:
727
                new_history = new_history[:new_history.index(revision_id) + 1]
728
            except ValueError:
729
                rev = self.repository.get_revision(revision_id)
730
                new_history = rev.get_history(self.repository)[1:]
731
        destination.set_revision_history(new_history)
732
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.
733
    @needs_read_lock
734
    def copy_content_into(self, destination, revision_id=None):
735
        """Copy the content of self into destination.
736
737
        revision_id: if not None, the revision history in the new branch will
738
                     be truncated to end with revision_id.
739
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
740
        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)
741
        try:
742
            parent = self.get_parent()
743
        except errors.InaccessibleParent, e:
744
            mutter('parent was not accessible to copy: %s', e)
745
        else:
746
            if parent:
747
                destination.set_parent(parent)
2348.2.1 by Marien Zwart
Properly push tags if push creates a new branch.
748
        self.tags.merge_to(destination.tags)
1185.66.1 by Aaron Bentley
Merged from mainline
749
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
750
    @needs_read_lock
751
    def check(self):
752
        """Check consistency of the branch.
753
754
        In particular this checks that revisions given in the revision-history
755
        do actually match up in the revision graph, and that they're all 
756
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
757
        
758
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
759
760
        :return: A BranchCheckResult.
761
        """
762
        mainline_parent_id = None
3389.2.1 by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent.
763
        last_revno, last_revision_id = self.last_revision_info()
764
        real_rev_history = list(self.repository.iter_reverse_revision_history(
765
                                last_revision_id))
766
        real_rev_history.reverse()
767
        if len(real_rev_history) != last_revno:
768
            raise errors.BzrCheckError('revno does not match len(mainline)'
769
                ' %s != %s' % (last_revno, len(real_rev_history)))
770
        # TODO: We should probably also check that real_rev_history actually
771
        #       matches self.revision_history()
772
        for revision_id in real_rev_history:
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
773
            try:
774
                revision = self.repository.get_revision(revision_id)
775
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
776
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
777
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
778
            # In general the first entry on the revision history has no parents.
779
            # But it's not illegal for it to have parents listed; this can happen
780
            # in imports from Arch when the parents weren't reachable.
781
            if mainline_parent_id is not None:
782
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
783
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
784
                                        "parents of {%s}"
785
                                        % (mainline_parent_id, revision_id))
786
            mainline_parent_id = revision_id
787
        return BranchCheckResult(self)
788
1910.2.39 by Aaron Bentley
Fix checkout bug
789
    def _get_checkout_format(self):
790
        """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.
791
        Weaves are used if this branch's repository uses weaves.
1910.2.39 by Aaron Bentley
Fix checkout bug
792
        """
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.
793
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
794
            from bzrlib.repofmt import weaverepo
1910.2.39 by Aaron Bentley
Fix checkout bug
795
            format = bzrdir.BzrDirMetaFormat1()
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
796
            format.repository_format = weaverepo.RepositoryFormat7()
1910.2.39 by Aaron Bentley
Fix checkout bug
797
        else:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
798
            format = self.repository.bzrdir.checkout_metadir()
2370.3.2 by John Arbash Meinel
Use BzrDir.set_branch_format() rather than setting it directly.
799
            format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
800
        return format
801
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
802
    def create_checkout(self, to_location, revision_id=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
803
                        lightweight=False, accelerator_tree=None,
804
                        hardlink=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
805
        """Create a checkout of a branch.
806
        
807
        :param to_location: The url to produce the checkout at
808
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
809
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
810
        produce a bound branch (heavyweight checkout)
3123.5.17 by Aaron Bentley
Update docs
811
        :param accelerator_tree: A tree which can be used for retrieving file
812
            contents more quickly than the revision tree, i.e. a workingtree.
813
            The revision tree will be used for cases where accelerator_tree's
814
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
815
        :param hardlink: If true, hard-link files from accelerator_tree,
816
            where possible.
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
817
        :return: The tree of the created checkout
818
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
819
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
820
        t.ensure_base()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
821
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
822
            format = self._get_checkout_format()
823
            checkout = format.initialize_on_transport(t)
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
824
            from_branch = BranchReferenceFormat().initialize(checkout, self)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
825
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
826
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
827
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
828
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
829
            checkout = checkout_branch.bzrdir
830
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
831
            # pull up to the specified revision_id to set the initial 
832
            # branch tip correctly, and seed it with history.
833
            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.
834
            from_branch=None
835
        tree = checkout.create_workingtree(revision_id,
3123.5.2 by Aaron Bentley
Allow checkout --files_from
836
                                           from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
837
                                           accelerator_tree=accelerator_tree,
838
                                           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.
839
        basis_tree = tree.basis_tree()
840
        basis_tree.lock_read()
841
        try:
842
            for path, file_id in basis_tree.iter_references():
843
                reference_parent = self.reference_parent(file_id, path)
844
                reference_parent.create_checkout(tree.abspath(path),
845
                    basis_tree.get_reference_revision(file_id, path),
846
                    lightweight)
847
        finally:
848
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
849
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
850
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
851
    @needs_write_lock
852
    def reconcile(self, thorough=True):
853
        """Make sure the data stored in this branch is consistent."""
854
        from bzrlib.reconcile import BranchReconciler
855
        reconciler = BranchReconciler(self, thorough=thorough)
856
        reconciler.reconcile()
857
        return reconciler
858
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
859
    def reference_parent(self, file_id, path):
2100.3.29 by Aaron Bentley
Get merge working initially
860
        """Return the parent branch for a tree-reference file_id
861
        :param file_id: The file_id of the tree reference
862
        :param path: The path of the file_id in the tree
863
        :return: A branch associated with the file_id
864
        """
865
        # FIXME should provide multiple branches, based on config
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
866
        return Branch.open(self.bzrdir.root_transport.clone(path).base)
867
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
868
    def supports_tags(self):
869
        return self._format.supports_tags()
870
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.
871
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
872
                                         other_branch):
3441.5.18 by Andrew Bennetts
Fix some test failures.
873
        """Ensure that revision_b is a descendant of revision_a.
874
875
        This is a helper function for update_revisions.
876
        
877
        :raises: DivergedBranches if revision_b has diverged from revision_a.
878
        :returns: True if revision_b is a descendant of revision_a.
879
        """
880
        relation = self._revision_relations(revision_a, revision_b, graph)
881
        if relation == 'b_descends_from_a':
882
            return True
883
        elif relation == 'diverged':
884
            raise errors.DivergedBranches(self, other_branch)
885
        elif relation == 'a_descends_from_b':
886
            return False
887
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
888
            raise AssertionError("invalid relation: %r" % (relation,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
889
890
    def _revision_relations(self, revision_a, revision_b, graph):
891
        """Determine the relationship between two revisions.
892
        
893
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
894
        """
895
        heads = graph.heads([revision_a, revision_b])
896
        if heads == set([revision_b]):
897
            return 'b_descends_from_a'
898
        elif heads == set([revision_a, revision_b]):
899
            # These branches have diverged
900
            return 'diverged'
901
        elif heads == set([revision_a]):
902
            return 'a_descends_from_b'
903
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
904
            raise AssertionError("invalid heads: %r" % (heads,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
905
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
906
907
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
908
    """An encapsulation of the initialization and open routines for a format.
909
910
    Formats provide three things:
911
     * An initialization routine,
912
     * a format string,
913
     * an open routine.
914
915
    Formats are placed in an dict by their format string for reference 
916
    during branch opening. Its not required that these be instances, they
917
    can be classes themselves with class methods - it simply depends on 
918
    whether state is needed for a given format or not.
919
920
    Once a format is deprecated, just deprecate the initialize and open
921
    methods on the format class. Do not deprecate the object, as the 
922
    object will be created every time regardless.
923
    """
924
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
925
    _default_format = None
926
    """The default format used for new branches."""
927
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
928
    _formats = {}
929
    """The known formats."""
930
2363.5.5 by Aaron Bentley
add info.describe_format
931
    def __eq__(self, other):
932
        return self.__class__ is other.__class__
933
934
    def __ne__(self, other):
935
        return not (self == other)
936
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
937
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
938
    def find_format(klass, a_bzrdir):
939
        """Return the format for the branch object in a_bzrdir."""
940
        try:
941
            transport = a_bzrdir.get_branch_transport(None)
942
            format_string = transport.get("format").read()
943
            return klass._formats[format_string]
3236.1.2 by Michael Hudson
clean up branch.py imports
944
        except errors.NoSuchFile:
945
            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.
946
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
947
            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.
948
949
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
950
    def get_default_format(klass):
951
        """Return the current default format."""
952
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
953
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
954
    def get_reference(self, a_bzrdir):
955
        """Get the target reference of the branch in a_bzrdir.
956
957
        format probing must have been completed before calling
958
        this method - it is assumed that the format of the branch
959
        in a_bzrdir is correct.
960
961
        :param a_bzrdir: The bzrdir to get the branch data from.
962
        :return: None if the branch is not a reference branch.
963
        """
964
        return None
965
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
966
    @classmethod
967
    def set_reference(self, a_bzrdir, to_branch):
968
        """Set the target reference of the branch in a_bzrdir.
969
970
        format probing must have been completed before calling
971
        this method - it is assumed that the format of the branch
972
        in a_bzrdir is correct.
973
974
        :param a_bzrdir: The bzrdir to set the branch reference for.
975
        :param to_branch: branch that the checkout is to reference
976
        """
977
        raise NotImplementedError(self.set_reference)
978
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
979
    def get_format_string(self):
980
        """Return the ASCII format string that identifies this format."""
981
        raise NotImplementedError(self.get_format_string)
982
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
983
    def get_format_description(self):
984
        """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).
985
        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
986
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
987
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
988
                           set_format=True):
989
        """Initialize a branch in a bzrdir, with specified files
990
991
        :param a_bzrdir: The bzrdir to initialize the branch in
992
        :param utf8_files: The files to create as a list of
993
            (filename, content) tuples
994
        :param set_format: If True, set the format with
995
            self.get_format_string.  (BzrBranch4 has its format set
996
            elsewhere)
997
        :return: a branch in this format
998
        """
999
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1000
        branch_transport = a_bzrdir.get_branch_transport(self)
1001
        lock_map = {
1002
            'metadir': ('lock', lockdir.LockDir),
1003
            'branch4': ('branch-lock', lockable_files.TransportLock),
1004
        }
1005
        lock_name, lock_class = lock_map[lock_type]
1006
        control_files = lockable_files.LockableFiles(branch_transport,
1007
            lock_name, lock_class)
1008
        control_files.create_lock()
1009
        control_files.lock_write()
1010
        if set_format:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1011
            utf8_files += [('format', self.get_format_string())]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1012
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
1013
            for (filename, content) in utf8_files:
1014
                branch_transport.put_bytes(
1015
                    filename, content,
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1016
                    mode=a_bzrdir._get_file_mode())
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1017
        finally:
1018
            control_files.unlock()
1019
        return self.open(a_bzrdir, _found=True)
1020
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1021
    def initialize(self, a_bzrdir):
1022
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1023
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1024
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.
1025
    def is_supported(self):
1026
        """Is this format supported?
1027
1028
        Supported formats can be initialized and opened.
1029
        Unsupported formats may not support initialization or committing or 
1030
        some other features depending on the reason for not being supported.
1031
        """
1032
        return True
1033
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1034
    def open(self, a_bzrdir, _found=False):
1035
        """Return the branch object for a_bzrdir
1036
1037
        _found is a private parameter, do not use it. It is used to indicate
1038
               if format probing has already be done.
1039
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1040
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1041
1042
    @classmethod
1043
    def register_format(klass, format):
1044
        klass._formats[format.get_format_string()] = format
1045
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
1046
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1047
    def set_default_format(klass, format):
1048
        klass._default_format = format
1049
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1050
    def supports_stacking(self):
1051
        """True if this format records a stacked-on branch."""
1052
        return False
1053
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1054
    @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.
1055
    def unregister_format(klass, format):
1056
        del klass._formats[format.get_format_string()]
1057
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1058
    def __str__(self):
1059
        return self.get_format_string().rstrip()
1060
2220.2.10 by Martin Pool
(broken) start moving things to branches
1061
    def supports_tags(self):
1062
        """True if this format supports tags stored in the branch"""
1063
        return False  # by default
1064
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1065
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1066
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1067
    """A dictionary mapping hook name to a list of callables for branch hooks.
1068
    
1069
    e.g. ['set_rh'] Is the list of items to be called when the
1070
    set_revision_history function is invoked.
1071
    """
1072
1073
    def __init__(self):
1074
        """Create the default hooks.
1075
1076
        These are all empty initially, because by default nothing should get
1077
        notified.
1078
        """
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1079
        Hooks.__init__(self)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1080
        # 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.
1081
        # invoked whenever the revision history has been set
1082
        # with set_revision_history. The api signature is
1083
        # (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
1084
        # be write-locked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1085
        self['set_rh'] = []
3681.1.1 by Robert Collins
Create a new hook Branch.open. (Robert Collins)
1086
        # Invoked after a branch is opened. The api signature is (branch).
1087
        self['open'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1088
        # invoked after a push operation completes.
1089
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
1090
        # (push_result)
1091
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1092
        # (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)
1093
        # 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
1094
        # master branch, and the rest should be self explanatory. The source
1095
        # is read locked and the target branches write locked. Source will
1096
        # be the local low-latency branch.
1097
        self['post_push'] = []
1098
        # invoked after a pull operation completes.
1099
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
1100
        # (pull_result)
1101
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1102
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
1103
        # where local is the local branch or None, master is the target 
1104
        # master branch, and the rest should be self explanatory. The source
1105
        # is read locked and the target branches write locked. The local
1106
        # branch is the low-latency branch.
1107
        self['post_pull'] = []
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
1108
        # invoked before a commit operation takes place.
1109
        # the api signature is
1110
        # (local, master, old_revno, old_revid, future_revno, future_revid,
2659.3.9 by NamNguyen
branch.py:
1111
        #  tree_delta, future_tree).
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
1112
        # old_revid is NULL_REVISION for the first commit to a branch
2659.3.9 by NamNguyen
branch.py:
1113
        # tree_delta is a TreeDelta object describing changes from the basis
1114
        # revision, hooks MUST NOT modify this delta
1115
        # future_tree is an in-memory tree obtained from
1116
        # CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
1117
        self['pre_commit'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1118
        # invoked after a commit operation completes.
1119
        # the api signature is 
1120
        # (local, master, old_revno, old_revid, new_revno, new_revid)
1121
        # old_revid is NULL_REVISION for the first commit to a branch.
1122
        self['post_commit'] = []
1123
        # invoked after a uncommit operation completes.
1124
        # the api signature is
1125
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
1126
        # local is the local branch or None, master is the target branch,
1127
        # and an empty branch recieves new_revno of 0, new_revid of None.
1128
        self['post_uncommit'] = []
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1129
        # Introduced in 1.6
1130
        # Invoked before the tip of a branch changes.
1131
        # the api signature is
1132
        # (params) where params is a ChangeBranchTipParams with the members
1133
        # (branch, old_revno, new_revno, old_revid, new_revid)
1134
        self['pre_change_branch_tip'] = []
3331.1.1 by James Henstridge
Add set_last_revision_info hook.
1135
        # Introduced in 1.4
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1136
        # Invoked after the tip of a branch changes.
1137
        # the api signature is
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1138
        # (params) where params is a ChangeBranchTipParams with the members
1139
        # (branch, old_revno, new_revno, old_revid, new_revid)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1140
        self['post_change_branch_tip'] = []
3770.2.1 by Michael Hudson
test and feature
1141
        # Introduced in 1.9
1142
        # Invoked when a stacked branch activates its fallback locations and
1143
        # allows the transformation of the url of said location.
1144
        # the api signature is
3770.2.2 by Michael Hudson
docs
1145
        # (branch, url) where branch is the branch having its fallback
1146
        # location activated and url is the url for the fallback location.
3770.2.1 by Michael Hudson
test and feature
1147
        # The hook should return a url.
1148
        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.
1149
1150
1151
# install the default hooks into the Branch class.
1152
Branch.hooks = BranchHooks()
1153
1154
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1155
class ChangeBranchTipParams(object):
1156
    """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()
1157
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1158
    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()
1159
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1160
    :ivar branch: the branch being changed
1161
    :ivar old_revno: revision number before the change
1162
    :ivar new_revno: revision number after the change
1163
    :ivar old_revid: revision id before the change
1164
    :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()
1165
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1166
    The revid fields are strings. The revno fields are integers.
1167
    """
1168
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1169
    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
1170
        """Create a group of ChangeBranchTip parameters.
1171
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1172
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1173
        :param old_revno: Revision number before the change.
1174
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1175
        :param old_revid: Tip revision id before the change.
1176
        :param new_revid: Tip revision id after the change.
1177
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1178
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1179
        self.old_revno = old_revno
1180
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1181
        self.old_revid = old_revid
1182
        self.new_revid = new_revid
1183
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1184
    def __eq__(self, other):
1185
        return self.__dict__ == other.__dict__
1186
    
1187
    def __repr__(self):
1188
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1189
            self.__class__.__name__, self.branch, 
1190
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1191
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1192
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1193
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1194
    """Bzr branch format 4.
1195
1196
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1197
     - 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.
1198
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1199
    """
1200
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1201
    def get_format_description(self):
1202
        """See BranchFormat.get_format_description()."""
1203
        return "Branch format 4"
1204
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1205
    def initialize(self, a_bzrdir):
1206
        """Create a branch of this format in a_bzrdir."""
1207
        utf8_files = [('revision-history', ''),
1208
                      ('branch-name', ''),
1209
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1210
        return self._initialize_helper(a_bzrdir, utf8_files,
1211
                                       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.
1212
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1213
    def __init__(self):
1214
        super(BzrBranchFormat4, self).__init__()
1215
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1216
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1217
    def open(self, a_bzrdir, _found=False):
1218
        """Return the branch object for a_bzrdir
1219
1220
        _found is a private parameter, do not use it. It is used to indicate
1221
               if format probing has already be done.
1222
        """
1223
        if not _found:
1224
            # we are being called directly and must probe.
1225
            raise NotImplementedError
1226
        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.
1227
                         _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.
1228
                         a_bzrdir=a_bzrdir,
1229
                         _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.
1230
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1231
    def __str__(self):
1232
        return "Bazaar-NG branch format 4"
1233
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1234
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1235
class BranchFormatMetadir(BranchFormat):
1236
    """Common logic for meta-dir based branch formats."""
1237
1238
    def _branch_class(self):
1239
        """What class to instantiate on open calls."""
1240
        raise NotImplementedError(self._branch_class)
1241
1242
    def open(self, a_bzrdir, _found=False):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1243
        """Return the branch object for a_bzrdir.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1244
1245
        _found is a private parameter, do not use it. It is used to indicate
1246
               if format probing has already be done.
1247
        """
1248
        if not _found:
1249
            format = BranchFormat.find_format(a_bzrdir)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
1250
            if format.__class__ != self.__class__:
1251
                raise AssertionError("wrong format %r found for %r" %
1252
                    (format, self))
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1253
        try:
1254
            transport = a_bzrdir.get_branch_transport(None)
1255
            control_files = lockable_files.LockableFiles(transport, 'lock',
1256
                                                         lockdir.LockDir)
1257
            return self._branch_class()(_format=self,
1258
                              _control_files=control_files,
1259
                              a_bzrdir=a_bzrdir,
1260
                              _repository=a_bzrdir.find_repository())
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
1261
        except errors.NoSuchFile:
1262
            raise errors.NotBranchError(path=transport.base)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1263
1264
    def __init__(self):
1265
        super(BranchFormatMetadir, self).__init__()
1266
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1267
1268
    def supports_tags(self):
1269
        return True
1270
1271
1272
class BzrBranchFormat5(BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1273
    """Bzr branch format 5.
1274
1275
    This format has:
1276
     - a revision-history file.
1277
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1278
     - a lock dir guarding the branch itself
1279
     - 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.
1280
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1281
1282
    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.
1283
    """
1284
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1285
    def _branch_class(self):
1286
        return BzrBranch5
1287
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1288
    def get_format_string(self):
1289
        """See BranchFormat.get_format_string()."""
1290
        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
1291
1292
    def get_format_description(self):
1293
        """See BranchFormat.get_format_description()."""
1294
        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.
1295
        
1296
    def initialize(self, a_bzrdir):
1297
        """Create a branch of this format in a_bzrdir."""
1298
        utf8_files = [('revision-history', ''),
1299
                      ('branch-name', ''),
1300
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1301
        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.
1302
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1303
    def supports_tags(self):
1304
        return False
1305
1306
1307
class BzrBranchFormat6(BranchFormatMetadir):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1308
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1309
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1310
    Unlike previous formats, this has no explicit revision history. Instead,
1311
    this just stores the last-revision, and the left-hand history leading
1312
    up to there is the history.
1313
1314
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1315
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
1316
    """
1317
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1318
    def _branch_class(self):
1319
        return BzrBranch6
1320
2230.3.1 by Aaron Bentley
Get branch6 creation working
1321
    def get_format_string(self):
1322
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1323
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
1324
1325
    def get_format_description(self):
1326
        """See BranchFormat.get_format_description()."""
1327
        return "Branch format 6"
1328
1329
    def initialize(self, a_bzrdir):
1330
        """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
1331
        utf8_files = [('last-revision', '0 null:\n'),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1332
                      ('branch.conf', ''),
1333
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1334
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1335
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1336
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1337
1338
class BzrBranchFormat7(BranchFormatMetadir):
1339
    """Branch format with last-revision, tags, and a stacked location pointer.
1340
1341
    The stacked location pointer is passed down to the repository and requires
1342
    a repository format with supports_external_lookups = True.
1343
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
1344
    This format was introduced in bzr 1.6.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1345
    """
1346
1347
    def _branch_class(self):
1348
        return BzrBranch7
1349
1350
    def get_format_string(self):
1351
        """See BranchFormat.get_format_string()."""
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
1352
        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1353
1354
    def get_format_description(self):
1355
        """See BranchFormat.get_format_description()."""
1356
        return "Branch format 7"
1357
1358
    def initialize(self, a_bzrdir):
1359
        """Create a branch of this format in a_bzrdir."""
1360
        utf8_files = [('last-revision', '0 null:\n'),
1361
                      ('branch.conf', ''),
1362
                      ('tags', ''),
1363
                      ]
1364
        return self._initialize_helper(a_bzrdir, utf8_files)
2220.2.27 by Martin Pool
Start adding tags to Branch6
1365
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1366
    def __init__(self):
3221.11.7 by Robert Collins
Merge in real stacked repository work.
1367
        super(BzrBranchFormat7, self).__init__()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1368
        self._matchingbzrdir.repository_format = \
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
1369
            RepositoryFormatKnitPack5RichRoot()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1370
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1371
    def supports_stacking(self):
1372
        return True
1373
2230.3.1 by Aaron Bentley
Get branch6 creation working
1374
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.
1375
class BranchReferenceFormat(BranchFormat):
1376
    """Bzr branch reference format.
1377
1378
    Branch references are used in implementing checkouts, they
1379
    act as an alias to the real branch which is at some other url.
1380
1381
    This format has:
1382
     - A location file
1383
     - a format string
1384
    """
1385
1386
    def get_format_string(self):
1387
        """See BranchFormat.get_format_string()."""
1388
        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
1389
1390
    def get_format_description(self):
1391
        """See BranchFormat.get_format_description()."""
1392
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1393
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1394
    def get_reference(self, a_bzrdir):
1395
        """See BranchFormat.get_reference()."""
1396
        transport = a_bzrdir.get_branch_transport(None)
1397
        return transport.get('location').read()
1398
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1399
    def set_reference(self, a_bzrdir, to_branch):
1400
        """See BranchFormat.set_reference()."""
1401
        transport = a_bzrdir.get_branch_transport(None)
1402
        location = transport.put_bytes('location', to_branch.base)
1403
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.
1404
    def initialize(self, a_bzrdir, target_branch=None):
1405
        """Create a branch of this format in a_bzrdir."""
1406
        if target_branch is None:
1407
            # this format does not implement branch itself, thus the implicit
1408
            # creation contract must see it as uninitializable
1409
            raise errors.UninitializableFormat(self)
1410
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1411
        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
1412
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1413
            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
1414
        branch_transport.put_bytes('format', self.get_format_string())
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1415
        return self.open(
1416
            a_bzrdir, _found=True,
1417
            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.
1418
1419
    def __init__(self):
1420
        super(BranchReferenceFormat, self).__init__()
1421
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1422
1423
    def _make_reference_clone_function(format, a_branch):
1424
        """Create a clone() routine for a branch dynamically."""
1425
        def clone(to_bzrdir, revision_id=None):
1426
            """See Branch.clone()."""
1427
            return format.initialize(to_bzrdir, a_branch)
1428
            # cannot obey revision_id limits when cloning a reference ...
1429
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1430
            # emit some sort of warning/error to the caller ?!
1431
        return clone
1432
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1433
    def open(self, a_bzrdir, _found=False, location=None,
1434
             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.
1435
        """Return the branch that the branch reference in a_bzrdir points at.
1436
1437
        _found is a private parameter, do not use it. It is used to indicate
1438
               if format probing has already be done.
1439
        """
1440
        if not _found:
1441
            format = BranchFormat.find_format(a_bzrdir)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1442
            if format.__class__ != self.__class__:
1443
                raise AssertionError("wrong format %r found for %r" %
1444
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1445
        if location is None:
1446
            location = self.get_reference(a_bzrdir)
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1447
        real_bzrdir = bzrdir.BzrDir.open(
1448
            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.
1449
        result = real_bzrdir.open_branch()
1450
        # this changes the behaviour of result.clone to create a new reference
1451
        # rather than a copy of the content of the branch.
1452
        # I did not use a proxy object because that needs much more extensive
1453
        # testing, and we are only changing one behaviour at the moment.
1454
        # If we decide to alter more behaviours - i.e. the implicit nickname
1455
        # then this should be refactored to introduce a tested proxy branch
1456
        # and a subclass of that for use in overriding clone() and ....
1457
        # - RBC 20060210
1458
        result.clone = self._make_reference_clone_function(result)
1459
        return result
1460
1461
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1462
# formats which have no format string are not discoverable
1463
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1464
__format5 = BzrBranchFormat5()
1465
__format6 = BzrBranchFormat6()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1466
__format7 = BzrBranchFormat7()
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1467
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.
1468
BranchFormat.register_format(BranchReferenceFormat())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1469
BranchFormat.register_format(__format6)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1470
BranchFormat.register_format(__format7)
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1471
BranchFormat.set_default_format(__format6)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1472
_legacy_formats = [BzrBranchFormat4(),
1473
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1474
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1475
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1476
    """A branch stored in the actual filesystem.
1477
1478
    Note that it's "local" in the context of the filesystem; it doesn't
1479
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1480
    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
1481
1482
    :ivar _transport: Transport for file operations on this branch's 
1483
        control files, typically pointing to the .bzr/branch directory.
1484
    :ivar repository: Repository for this branch.
1485
    :ivar base: The url of the base directory for this branch; the one 
1486
        containing the .bzr directory.
1 by mbp at sourcefrog
import from baz patch-364
1487
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1488
    
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1489
    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.
1490
                 _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)
1491
        """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.
1492
        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)
1493
            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.
1494
        else:
1495
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1496
        self._base = self.bzrdir.transport.clone('..').base
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1497
        # XXX: We should be able to just do
1498
        #   self.base = self.bzrdir.root_transport.base
1499
        # but this does not quite work yet -- mbp 20080522
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1500
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1501
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1502
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1503
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1504
        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.
1505
        self.repository = _repository
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
1506
        Branch.__init__(self)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1507
1 by mbp at sourcefrog
import from baz patch-364
1508
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1509
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1510
1511
    __repr__ = __str__
1512
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1513
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1514
        """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
1515
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1516
1442.1.5 by Robert Collins
Give branch.base a docstring.
1517
    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,
1518
1694.2.6 by Martin Pool
[merge] bzr.dev
1519
    def is_locked(self):
1520
        return self.control_files.is_locked()
1521
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).
1522
    def lock_write(self, token=None):
1523
        repo_token = self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1524
        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).
1525
            token = self.control_files.lock_write(token=token)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1526
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1527
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1528
            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).
1529
        return token
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1530
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1531
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1532
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1533
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1534
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1535
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1536
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1537
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1538
1539
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1540
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1541
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1542
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1543
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1544
            self.repository.unlock()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1545
        if not self.control_files.is_locked():
1546
            # we just released the lock
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1547
            self._clear_cached_state()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1548
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1549
    def peek_lock_mode(self):
1550
        if self.control_files._lock_count == 0:
1551
            return None
1552
        else:
1553
            return self.control_files._lock_mode
1554
1694.2.6 by Martin Pool
[merge] bzr.dev
1555
    def get_physical_lock_status(self):
1556
        return self.control_files.get_physical_lock_status()
1557
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1558
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1559
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1560
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1561
        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.
1562
2230.3.49 by Aaron Bentley
Fix cache updating
1563
    def _write_revision_history(self, history):
1564
        """Factored out of set_revision_history.
1565
1566
        This performs the actual writing to disk.
1567
        It is intended to be called by BzrBranch5.set_revision_history."""
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1568
        self._transport.put_bytes(
1569
            'revision-history', '\n'.join(history),
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1570
            mode=self.bzrdir._get_file_mode())
2230.3.49 by Aaron Bentley
Fix cache updating
1571
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1572
    @needs_write_lock
1573
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1574
        """See Branch.set_revision_history."""
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1575
        if 'evil' in debug.debug_flags:
1576
            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.
1577
        check_not_reserved_id = _mod_revision.check_not_reserved_id
1578
        for rev_id in rev_history:
1579
            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().
1580
        if Branch.hooks['post_change_branch_tip']:
1581
            # Don't calculate the last_revision_info() if there are no hooks
1582
            # that will use it.
1583
            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.
1584
        if len(rev_history) == 0:
1585
            revid = _mod_revision.NULL_REVISION
1586
        else:
1587
            revid = rev_history[-1]
1588
        self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2230.3.49 by Aaron Bentley
Fix cache updating
1589
        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.
1590
        self._clear_cached_state()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1591
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1592
        for hook in Branch.hooks['set_rh']:
1593
            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().
1594
        if Branch.hooks['post_change_branch_tip']:
1595
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
233 by mbp at sourcefrog
- more output from test.sh
1596
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1597
    def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1598
        """Run the pre_change_branch_tip hooks."""
1599
        hooks = Branch.hooks['pre_change_branch_tip']
1600
        if not hooks:
1601
            return
1602
        old_revno, old_revid = self.last_revision_info()
1603
        params = ChangeBranchTipParams(
1604
            self, old_revno, new_revno, old_revid, new_revid)
1605
        for hook in hooks:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1606
            try:
1607
                hook(params)
1608
            except errors.TipChangeRejected:
1609
                raise
1610
            except Exception:
1611
                exc_info = sys.exc_info()
1612
                hook_name = Branch.hooks.get_hook_name(hook)
1613
                raise errors.HookFailed(
1614
                    'pre_change_branch_tip', hook_name, exc_info)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1615
 
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1616
    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
1617
        """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.
1618
        hooks = Branch.hooks['post_change_branch_tip']
1619
        if not hooks:
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1620
            return
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1621
        new_revno, new_revid = self.last_revision_info()
1622
        params = ChangeBranchTipParams(
1623
            self, old_revno, new_revno, old_revid, new_revid)
1624
        for hook in hooks:
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1625
            hook(params)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1626
 
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1627
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1628
    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
1629
        """Set the last revision of this branch.
1630
1631
        The caller is responsible for checking that the revno is correct
1632
        for this revision id.
1633
1634
        It may be possible to set the branch last revision to an id not
1635
        present in the repository.  However, branches can also be 
1636
        configured to check constraints on history, in which case this may not
1637
        be permitted.
1638
        """
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
1639
        revision_id = _mod_revision.ensure_null(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1640
        # this old format stores the full history, but this api doesn't
1641
        # provide it, so we must generate, and might as well check it's
1642
        # correct
2697.2.5 by Martin Pool
Kill off append_revision
1643
        history = self._lefthand_history(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1644
        if len(history) != revno:
1645
            raise AssertionError('%d != %d' % (len(history), revno))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1646
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1647
2230.4.1 by Aaron Bentley
Get log as fast branch5
1648
    def _gen_revision_history(self):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
1649
        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.
1650
        if history[-1:] == ['']:
1651
            # There shouldn't be a trailing newline, but just in case.
1652
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
1653
        return history
1654
2230.3.2 by Aaron Bentley
Get all branch tests passing
1655
    def _lefthand_history(self, revision_id, last_rev=None,
1656
                          other_branch=None):
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1657
        if 'evil' in debug.debug_flags:
1658
            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.
1659
        # stop_revision must be a descendant of last_revision
3240.1.3 by Aaron Bentley
Use Graph to generate revision_history
1660
        graph = self.repository.get_graph()
1661
        if last_rev is not None:
1662
            if not graph.is_ancestor(last_rev, revision_id):
1663
                # our previous tip is not merged into stop_revision
1664
                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.
1665
        # make a new revision history from the graph
3240.1.4 by Aaron Bentley
Simplify _lefthand_history code
1666
        parents_map = graph.get_parent_map([revision_id])
1667
        if revision_id not in parents_map:
1668
            raise errors.NoSuchRevision(self, revision_id)
1669
        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.
1670
        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.
1671
        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
1672
        # Do not include ghosts or graph origin in revision_history
1673
        while (current_rev_id in parents_map and
1674
               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.
1675
            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.
1676
            new_history.append(current_rev_id)
3240.1.5 by Aaron Bentley
Further clean-ups, move None conversion out into API functions
1677
            current_rev_id = parents_map[current_rev_id][0]
3240.1.4 by Aaron Bentley
Simplify _lefthand_history code
1678
            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.
1679
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1680
        return new_history
1681
1682
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1683
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1684
        other_branch=None):
1685
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1686
2230.3.2 by Aaron Bentley
Get all branch tests passing
1687
        :param revision_id: the new tip to use.
1688
        :param last_rev: The previous last_revision. If not None, then this
1689
            must be a ancestory of revision_id, or DivergedBranches is raised.
1690
        :param other_branch: The other branch that DivergedBranches should
1691
            raise with respect to.
1692
        """
1693
        self.set_revision_history(self._lefthand_history(revision_id,
1694
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1695
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1696
    def basis_tree(self):
1697
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1698
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1699
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1700
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1701
    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.
1702
             _hook_master=None, run_hooks=True, possible_transports=None,
1703
             _override_hook_target=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1704
        """See Branch.pull.
1705
1706
        :param _hook_master: Private parameter - set the branch to 
3489.2.7 by Andrew Bennetts
Update comments and docstrings, add NEWS entry.
1707
            be supplied as the master to pull hooks.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1708
        :param run_hooks: Private parameter - if false, this branch
1709
            is being called because it's the master of the primary branch,
1710
            so it should not run its hooks.
3489.2.7 by Andrew Bennetts
Update comments and docstrings, add NEWS entry.
1711
        :param _override_hook_target: Private parameter - set the branch to be
1712
            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
1713
        """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1714
        result = PullResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1715
        result.source_branch = source
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1716
        if _override_hook_target is None:
1717
            result.target_branch = self
1718
        else:
1719
            result.target_branch = _override_hook_target
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1720
        source.lock_read()
1721
        try:
3445.1.6 by John Arbash Meinel
Start using the 'graph' parameter of update_revisions to bias push and pull checking
1722
            # We assume that during 'pull' the local repository is closer than
1723
            # the remote one.
1724
            graph = self.repository.get_graph(source.repository)
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1725
            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
1726
            self.update_revisions(source, stop_revision, overwrite=overwrite,
1727
                                  graph=graph)
2804.3.1 by Lukáš Lalinský
Overwrite conflicting tags by push|pull --overwrite.
1728
            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.
1729
            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.
1730
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1731
                result.master_branch = _hook_master
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1732
                result.local_branch = result.target_branch
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1733
            else:
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1734
                result.master_branch = result.target_branch
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1735
                result.local_branch = None
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1736
            if run_hooks:
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1737
                for hook in Branch.hooks['post_pull']:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1738
                    hook(result)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1739
        finally:
1740
            source.unlock()
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1741
        return result
1 by mbp at sourcefrog
import from baz patch-364
1742
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1743
    def _get_parent_location(self):
1744
        _locs = ['parent', 'pull', 'x-pull']
1745
        for l in _locs:
1746
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
1747
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
1748
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1749
                pass
1750
        return None
1751
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1752
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1753
    def push(self, target, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1754
             _override_hook_source_branch=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1755
        """See Branch.push.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1756
1757
        This is the basic concrete implementation of push()
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1758
1759
        :param _override_hook_source_branch: If specified, run
1760
        the hooks passing this Branch as the source, rather than self.  
1761
        This is for use of RemoteBranch, where push is delegated to the
1762
        underlying vfs-based Branch. 
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1763
        """
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1764
        # TODO: Public option to disable running hooks - should be trivial but
1765
        # 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()
1766
        return _run_with_write_locked_target(
1767
            target, self._push_with_bound_branches, target, overwrite,
1768
            stop_revision,
1769
            _override_hook_source_branch=_override_hook_source_branch)
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1770
1771
    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
1772
            stop_revision,
1773
            _override_hook_source_branch=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1774
        """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)
1775
        
1776
        This is on the base BzrBranch class even though it doesn't support 
1777
        bound branches because the *target* might be bound.
1778
        """
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1779
        def _run_hooks():
1780
            if _override_hook_source_branch:
1781
                result.source_branch = _override_hook_source_branch
1782
            for hook in Branch.hooks['post_push']:
1783
                hook(result)
1784
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1785
        bound_location = target.get_bound_location()
1786
        if bound_location and target.base != bound_location:
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1787
            # there is a master branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1788
            #
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1789
            # XXX: Why the second check?  Is it even supported for a branch to
1790
            # be bound to itself? -- mbp 20070507
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1791
            master_branch = target.get_master_branch()
1792
            master_branch.lock_write()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1793
            try:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1794
                # push into the master from this branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1795
                self._basic_push(master_branch, overwrite, stop_revision)
1796
                # and push into the target branch from this. Note that we push from
1797
                # this branch again, because its considered the highest bandwidth
1798
                # repository.
1799
                result = self._basic_push(target, overwrite, stop_revision)
1800
                result.master_branch = master_branch
1801
                result.local_branch = target
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1802
                _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1803
                return result
1804
            finally:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1805
                master_branch.unlock()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1806
        else:
1807
            # no master branch
1808
            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
1809
            # TODO: Why set master_branch and local_branch if there's no
1810
            # binding?  Maybe cleaner to just leave them unset? -- mbp
1811
            # 20070504
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1812
            result.master_branch = target
1813
            result.local_branch = None
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1814
            _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1815
            return result
1816
1817
    def _basic_push(self, target, overwrite, stop_revision):
1818
        """Basic implementation of push without bound branches or hooks.
1819
1820
        Must be called with self read locked and target write locked.
1821
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1822
        result = PushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1823
        result.source_branch = self
1824
        result.target_branch = target
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
1825
        result.old_revno, result.old_revid = target.last_revision_info()
3703.3.1 by Andrew Bennetts
Skip unnecessary work in BzrBranch._basic_push.
1826
        if result.old_revid != self.last_revision():
1827
            # We assume that during 'push' this repository is closer than
1828
            # the target.
1829
            graph = self.repository.get_graph(target.repository)
1830
            target.update_revisions(self, stop_revision, overwrite=overwrite,
1831
                                    graph=graph)
3703.3.5 by Andrew Bennetts
Allow subclasses to control if _basic_push can skip tag merging.
1832
        if self._push_should_merge_tags():
3703.3.1 by Andrew Bennetts
Skip unnecessary work in BzrBranch._basic_push.
1833
            result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
1834
        result.new_revno, result.new_revid = target.last_revision_info()
1835
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1836
3703.3.5 by Andrew Bennetts
Allow subclasses to control if _basic_push can skip tag merging.
1837
    def _push_should_merge_tags(self):
1838
        """Should _basic_push merge this branch's tags into the target?
1839
        
1840
        The default implementation returns False if this branch has no tags,
1841
        and True the rest of the time.  Subclasses may override this.
1842
        """
1843
        return self.tags.supports_tags() and self.tags.get_tag_dict()
1844
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1845
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1846
        """See Branch.get_parent."""
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1847
        parent = self._get_parent_location()
1848
        if parent is None:
1849
            return parent
1850
        # This is an old-format absolute path to a local branch
1851
        # turn it into a url
1852
        if parent.startswith('/'):
1853
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1854
        try:
1855
            return urlutils.join(self.base[:-1], parent)
1856
        except errors.InvalidURLJoin, e:
1857
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1858
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
1859
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1860
        raise errors.UnstackableBranchFormat(self._format, self.base)
1861
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1862
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1863
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1864
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1865
            'push_location', location,
1866
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1867
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1868
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1869
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1870
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1871
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1872
        # URLs should never be unicode, even on the local fs,
1873
        # 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
1874
        # read and rewrite the file. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1875
        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
1876
            if isinstance(url, unicode):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1877
                try:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1878
                    url = url.encode('ascii')
1879
                except UnicodeEncodeError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1880
                    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
1881
                        "Urls must be 7-bit ascii, "
1882
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1883
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1884
        self._set_parent_location(url)
1885
1886
    def _set_parent_location(self, url):
1887
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1888
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1889
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1890
            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
1891
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
1892
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1893
    def set_stacked_on_url(self, url):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1894
        raise errors.UnstackableBranchFormat(self._format, self.base)
1895
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1896
1897
class BzrBranch5(BzrBranch):
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1898
    """A format 5 branch. This supports new features over plain branches.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1899
1900
    It has support for a master_branch which is the data for bound branches.
1901
    """
1902
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1903
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1904
    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.
1905
             run_hooks=True, possible_transports=None,
1906
             _override_hook_target=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1907
        """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
1908
        
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1909
        :param run_hooks: Private parameter - if false, this branch
1910
            is being called because it's the master of the primary branch,
1911
            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
1912
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1913
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1914
        master_branch = None
1915
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1916
            # not pulling from master, so we need to update master.
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1917
            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
1918
            master_branch.lock_write()
1919
        try:
1920
            if master_branch:
1921
                # pull from source into master.
1922
                master_branch.pull(source, overwrite, stop_revision,
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1923
                    run_hooks=False)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1924
            return super(BzrBranch5, self).pull(source, overwrite,
1925
                stop_revision, _hook_master=master_branch,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1926
                run_hooks=run_hooks,
1927
                _override_hook_target=_override_hook_target)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1928
        finally:
1929
            if master_branch:
1930
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1931
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1932
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1933
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
1934
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1935
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1936
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1937
1938
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1939
    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
1940
        """Return the branch we are bound to.
1941
        
1942
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1943
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1944
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1945
        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.
1946
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1947
        # 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
1948
        """
1949
        bound_loc = self.get_bound_location()
1950
        if not bound_loc:
1951
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1952
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1953
            return Branch.open(bound_loc,
1954
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1955
        except (errors.NotBranchError, errors.ConnectionError), e:
1956
            raise errors.BoundBranchConnectionFailure(
1957
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1958
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1959
    @needs_write_lock
1960
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1961
        """Set the target where this branch is bound to.
1962
1963
        :param location: URL to the target branch
1964
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1965
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1966
            self._transport.put_bytes('bound', location+'\n',
1967
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1968
        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.
1969
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1970
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
1971
            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.
1972
                return False
1973
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1974
1975
    @needs_write_lock
1976
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1977
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1978
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1979
        This does not push or pull data between the branches, though it does
1980
        check for divergence to raise an error when the branches are not
1981
        either the same, or one a prefix of the other. That behaviour may not
1982
        be useful, so that check may be removed in future.
1983
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1984
        :param other: The branch to bind to
1985
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1986
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1987
        # TODO: jam 20051230 Consider checking if the target is bound
1988
        #       It is debatable whether you should be able to bind to
1989
        #       a branch which is itself bound.
1990
        #       Committing is obviously forbidden,
1991
        #       but binding itself may not be.
1992
        #       Since we *have* to check at commit time, we don't
1993
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1994
1995
        # we want to raise diverged if:
1996
        # last_rev is not in the other_last_rev history, AND
1997
        # other_last_rev is not in our history, and do it without pulling
1998
        # history around
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1999
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2000
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
2001
    @needs_write_lock
2002
    def unbind(self):
2003
        """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.
2004
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
2005
1587.1.10 by Robert Collins
update updates working tree and branch together.
2006
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2007
    def update(self, possible_transports=None):
1587.1.10 by Robert Collins
update updates working tree and branch together.
2008
        """Synchronise this branch with the master branch if any. 
2009
2010
        :return: None or the last_revision that was pivoted out during the
2011
                 update.
2012
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
2013
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
2014
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2015
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
2016
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
2017
            if self.repository.get_graph().is_ancestor(old_tip,
2018
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
2019
                return None
2020
            return old_tip
2021
        return None
2022
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
2023
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2024
class BzrBranch7(BzrBranch5):
3517.4.7 by Martin Pool
doc
2025
    """A branch with support for a fallback repository."""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2026
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.
2027
    def _get_fallback_repository(self, url):
2028
        """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.
2029
        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.
2030
        return bzrdir.BzrDir.open(url).open_branch().repository
2031
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2032
    def _activate_fallback_location(self, url):
2033
        """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.
2034
        self.repository.add_fallback_repository(
2035
            self._get_fallback_repository(url))
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2036
2037
    def _open_hook(self):
2038
        try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2039
            url = self.get_stacked_on_url()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2040
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2041
            errors.UnstackableBranchFormat):
2042
            pass
2043
        else:
3770.2.1 by Michael Hudson
test and feature
2044
            for hook in Branch.hooks['transform_fallback_location']:
2045
                url = hook(self, url)
3770.2.3 by Michael Hudson
check for None being returned for a hook
2046
                if url is None:
2047
                    hook_name = Branch.hooks.get_hook_name(hook)
2048
                    raise AssertionError(
2049
                        "'transform_fallback_location' hook %s returned "
2050
                        "None, not a URL." % hook_name)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2051
            self._activate_fallback_location(url)
2052
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2053
    def _check_stackable_repo(self):
2054
        if not self.repository._format.supports_external_lookups:
2055
            raise errors.UnstackableRepositoryFormat(self.repository._format,
2056
                self.repository.base)
2230.3.2 by Aaron Bentley
Get all branch tests passing
2057
3298.2.2 by John Arbash Meinel
some small cleanups.
2058
    def __init__(self, *args, **kwargs):
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2059
        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.
2060
        self._last_revision_info_cache = None
3298.2.10 by Aaron Bentley
Refactor partial history code
2061
        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.
2062
2063
    def _clear_cached_state(self):
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2064
        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.
2065
        self._last_revision_info_cache = None
3298.2.10 by Aaron Bentley
Refactor partial history code
2066
        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.
2067
3298.2.10 by Aaron Bentley
Refactor partial history code
2068
    def _last_revision_info(self):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2069
        revision_string = self._transport.get_bytes('last-revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
2070
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2071
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2072
        revno = int(revno)
2073
        return revno, revision_id
2074
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2075
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
2076
        """Simply write out the revision id, with no checks.
2077
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2078
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
2079
2080
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2081
        Intended to be called by set_last_revision_info and
2082
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
2083
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2084
        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
2085
        out_string = '%d %s\n' % (revno, revision_id)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2086
        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
2087
            mode=self.bzrdir._get_file_mode())
2230.3.2 by Aaron Bentley
Get all branch tests passing
2088
2230.3.49 by Aaron Bentley
Fix cache updating
2089
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2090
    def set_last_revision_info(self, revno, revision_id):
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
2091
        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.
2092
        old_revno, old_revid = self.last_revision_info()
2230.3.49 by Aaron Bentley
Fix cache updating
2093
        if self._get_append_revisions_only():
2094
            self._check_history_violation(revision_id)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
2095
        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
2096
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
2097
        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.
2098
        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.
2099
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.3.49 by Aaron Bentley
Fix cache updating
2100
2230.3.32 by Aaron Bentley
Implement strict history policy
2101
    def _check_history_violation(self, revision_id):
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2102
        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
2103
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
2104
            return
2105
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2106
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
2107
2230.4.1 by Aaron Bentley
Get log as fast branch5
2108
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2109
        """Generate the revision history from last revision
2110
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2111
        last_revno, last_revision = self.last_revision_info()
2112
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2113
        return list(reversed(self._partial_revision_history_cache))
2114
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2115
    def _extend_partial_history(self, stop_index=None, stop_revision=None):
3298.2.10 by Aaron Bentley
Refactor partial history code
2116
        """Extend the partial history to include a given index
2117
3298.3.1 by Aaron Bentley
Make stop_revision optional for extend_partial_history
2118
        If a stop_index is supplied, stop when that index has been reached.
3298.2.17 by Aaron Bentley
Update from review
2119
        If a stop_revision is supplied, stop when that revision is
2120
        encountered.  Otherwise, stop when the beginning of history is
2121
        reached.
3298.2.10 by Aaron Bentley
Refactor partial history code
2122
3298.2.17 by Aaron Bentley
Update from review
2123
        :param stop_index: The index which should be present.  When it is
2124
            present, history extension will stop.
2125
        :param revision_id: The revision id which should be present.  When
2126
            it is encountered, history extension will stop.
3298.2.10 by Aaron Bentley
Refactor partial history code
2127
        """
2128
        repo = self.repository
2129
        if len(self._partial_revision_history_cache) == 0:
2130
            iterator = repo.iter_reverse_revision_history(self.last_revision())
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2131
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2132
            start_revision = self._partial_revision_history_cache[-1]
2133
            iterator = repo.iter_reverse_revision_history(start_revision)
2134
            #skip the last revision in the list
3298.3.3 by Aaron Bentley
Update from review
2135
            next_revision = iterator.next()
3298.2.10 by Aaron Bentley
Refactor partial history code
2136
        for revision_id in iterator:
2137
            self._partial_revision_history_cache.append(revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2138
            if (stop_index is not None and
2139
                len(self._partial_revision_history_cache) > stop_index):
2140
                break
2141
            if revision_id == stop_revision:
3298.2.10 by Aaron Bentley
Refactor partial history code
2142
                break
2230.3.2 by Aaron Bentley
Get all branch tests passing
2143
2230.3.49 by Aaron Bentley
Fix cache updating
2144
    def _write_revision_history(self, history):
2145
        """Factored out of set_revision_history.
2146
2147
        This performs the actual writing to disk, with format-specific checks.
2148
        It is intended to be called by BzrBranch5.set_revision_history.
2149
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
2150
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
2151
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
2152
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2153
            if history != self._lefthand_history(history[-1]):
2154
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
2155
            last_revision = history[-1]
2156
        if self._get_append_revisions_only():
2157
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2158
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2159
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2160
    @needs_write_lock
2161
    def _set_parent_location(self, url):
2162
        """Set the parent branch"""
2163
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2164
2165
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2166
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2167
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2168
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2169
2170
    def set_push_location(self, location):
2171
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2172
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2173
2174
    def set_bound_location(self, location):
2175
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
2176
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2177
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2178
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2179
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2180
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2181
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2182
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2183
                return True
2184
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2185
            self._set_config_location('bound_location', location,
2186
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2187
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2188
        return True
2189
2190
    def _get_bound_location(self, bound):
2191
        """Return the bound location in the config file.
2192
2193
        Return None if the bound parameter does not match"""
2194
        config = self.get_config()
2195
        config_bound = (config.get_user_option('bound') == 'True')
2196
        if config_bound != bound:
2197
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2198
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2199
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2200
    def get_bound_location(self):
2201
        """See Branch.set_push_location."""
2202
        return self._get_bound_location(True)
2203
2204
    def get_old_bound_location(self):
2205
        """See Branch.get_old_bound_location"""
2206
        return self._get_bound_location(False)
2207
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2208
    def get_stacked_on_url(self):
3691.2.12 by Martin Pool
Add test for coping without Branch.get_stacked_on_url
2209
        # you can always ask for the URL; but you might not be able to use it
2210
        # if the repo can't support stacking.
2211
        ## self._check_stackable_repo()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2212
        stacked_url = self._get_config_location('stacked_on_location')
2213
        if stacked_url is None:
3221.11.6 by Robert Collins
Stackable branch fixes.
2214
            raise errors.NotStacked(self)
2215
        return stacked_url
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2216
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2217
    def set_append_revisions_only(self, enabled):
2218
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2219
            value = 'True'
2220
        else:
2221
            value = 'False'
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2222
        self.get_config().set_user_option('append_revisions_only', value,
2223
            warn_masked=True)
2230.3.32 by Aaron Bentley
Implement strict history policy
2224
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2225
    def set_stacked_on_url(self, url):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2226
        self._check_stackable_repo()
3221.11.6 by Robert Collins
Stackable branch fixes.
2227
        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.
2228
            try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2229
                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.
2230
            except (errors.NotStacked, errors.UnstackableBranchFormat,
2231
                errors.UnstackableRepositoryFormat):
2232
                return
3221.11.6 by Robert Collins
Stackable branch fixes.
2233
            url = ''
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
2234
            # repositories don't offer an interface to remove fallback
2235
            # repositories today; take the conceptually simpler option and just
2236
            # reopen it.
2237
            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.
2238
            # for every revision reference the branch has, ensure it is pulled
2239
            # in.
2240
            source_repository = self._get_fallback_repository(old_url)
2241
            for revision_id in chain([self.last_revision()],
2242
                self.tags.get_reverse_tag_dict()):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2243
                self.repository.fetch(source_repository, revision_id,
2244
                    find_ghosts=True)
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
2245
        else:
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2246
            self._activate_fallback_location(url)
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
2247
        # write this out after the repository is stacked to avoid setting a
2248
        # stacked config that doesn't work.
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2249
        self._set_config_location('stacked_on_location', url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2250
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2251
    def _get_append_revisions_only(self):
2252
        value = self.get_config().get_user_option('append_revisions_only')
2253
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2254
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2255
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2256
        """Synchronize last revision and revision history between branches.
2257
2258
        This version is most efficient when the destination is also a
2259
        BzrBranch6, but works for BzrBranch5, as long as the destination's
2260
        repository contains all the lefthand ancestors of the intended
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2261
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2262
2263
        :param destination: The branch to copy the history into
2264
        :param revision_id: The revision-id to truncate history at.  May
2265
          be None to copy complete history.
2266
        """
2697.2.3 by Martin Pool
More append_revision cleanup; _synchronize_history optimization
2267
        source_revno, source_revision_id = self.last_revision_info()
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2268
        if revision_id is None:
2697.2.3 by Martin Pool
More append_revision cleanup; _synchronize_history optimization
2269
            revno, revision_id = source_revno, source_revision_id
2270
        elif source_revision_id == revision_id:
2271
            # we know the revno without needing to walk all of history
2272
            revno = source_revno
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2273
        else:
2592.3.155 by Robert Collins
Remove some spurious differences with bzr.dev.
2274
            # To figure out the revno for a random revision, we need to build
2275
            # the revision history, and count its length.
2276
            # We don't care about the order, just how long it is.
2277
            # Alternatively, we could start at the current location, and count
2278
            # backwards. But there is no guarantee that we will find it since
2279
            # it may be a merged revision.
2280
            revno = len(list(self.repository.iter_reverse_revision_history(
2281
                                                                revision_id)))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2282
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2283
2220.2.27 by Martin Pool
Start adding tags to Branch6
2284
    def _make_tags(self):
2285
        return BasicTags(self)
2286
3240.1.2 by Aaron Bentley
Add write lock
2287
    @needs_write_lock
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2288
    def generate_revision_history(self, revision_id, last_rev=None,
2289
                                  other_branch=None):
3240.1.6 by Aaron Bentley
Update docs
2290
        """See BzrBranch5.generate_revision_history"""
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2291
        history = self._lefthand_history(revision_id, last_rev, other_branch)
2292
        revno = len(history)
2293
        self.set_last_revision_info(revno, revision_id)
2294
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
2295
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2296
    def get_rev_id(self, revno, history=None):
2297
        """Find the revision id of the specified revno."""
2298
        if revno == 0:
2299
            return _mod_revision.NULL_REVISION
2300
2301
        last_revno, last_revision_id = self.last_revision_info()
2302
        if revno <= 0 or revno > last_revno:
2303
            raise errors.NoSuchRevision(self, revno)
2304
2305
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
2306
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2307
3298.2.10 by Aaron Bentley
Refactor partial history code
2308
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
2309
        if len(self._partial_revision_history_cache) <= index:
2310
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
2311
        if len(self._partial_revision_history_cache) > index:
2312
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2313
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2314
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2315
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2316
    @needs_read_lock
2317
    def revision_id_to_revno(self, revision_id):
2318
        """Given a revision id, return its revno"""
2319
        if _mod_revision.is_null(revision_id):
2320
            return 0
2321
        try:
2322
            index = self._partial_revision_history_cache.index(revision_id)
2323
        except ValueError:
2324
            self._extend_partial_history(stop_revision=revision_id)
2325
            index = len(self._partial_revision_history_cache) - 1
2326
            if self._partial_revision_history_cache[index] != revision_id:
2327
                raise errors.NoSuchRevision(self, revision_id)
2328
        return self.revno() - index
2329
2230.3.34 by Aaron Bentley
cleanup
2330
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2331
class BzrBranch6(BzrBranch7):
2332
    """See BzrBranchFormat6 for the capabilities of this branch.
2333
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2334
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2335
    i.e. stacking.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2336
    """
2337
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2338
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2339
        raise errors.UnstackableBranchFormat(self._format, self.base)
2340
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2341
    def set_stacked_on_url(self, url):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2342
        raise errors.UnstackableBranchFormat(self._format, self.base)
2343
2344
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2345
######################################################################
2346
# results of operations
2347
2220.2.37 by Martin Pool
Report conflicting tags from push.
2348
2349
class _Result(object):
2350
2351
    def _show_tag_conficts(self, to_file):
2352
        if not getattr(self, 'tag_conflicts', None):
2353
            return
2354
        to_file.write('Conflicting tags:\n')
2355
        for name, value1, value2 in self.tag_conflicts:
2356
            to_file.write('    %s\n' % (name, ))
2357
2358
2359
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2360
    """Result of a Branch.pull operation.
2361
2362
    :ivar old_revno: Revision number before pull.
2363
    :ivar new_revno: Revision number after pull.
2364
    :ivar old_revid: Tip revision id before pull.
2365
    :ivar new_revid: Tip revision id after pull.
2366
    :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.
2367
    :ivar master_branch: Master branch of the target, or the target if no
2368
        Master
2369
    :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
2370
    :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.
2371
    :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
2372
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2373
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2374
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2375
        # DEPRECATED: pull used to return the change in revno
2376
        return self.new_revno - self.old_revno
2377
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2378
    def report(self, to_file):
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
2379
        if not is_quiet():
2380
            if self.old_revid == self.new_revid:
2381
                to_file.write('No revisions to pull.\n')
2382
            else:
2383
                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
2384
        self._show_tag_conficts(to_file)
2385
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2386
2220.2.37 by Martin Pool
Report conflicting tags from push.
2387
class PushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2388
    """Result of a Branch.push operation.
2389
2390
    :ivar old_revno: Revision number before push.
2391
    :ivar new_revno: Revision number after push.
2392
    :ivar old_revid: Tip revision id before push.
2393
    :ivar new_revid: Tip revision id after push.
2394
    :ivar source_branch: Source branch object.
2395
    :ivar master_branch: Master branch of the target, or None.
2396
    :ivar target_branch: Target/destination branch object.
2397
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2398
2399
    def __int__(self):
2400
        # 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()
2401
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2402
2220.2.37 by Martin Pool
Report conflicting tags from push.
2403
    def report(self, to_file):
2404
        """Write a human-readable description of the result."""
2405
        if self.old_revid == self.new_revid:
2406
            to_file.write('No new revisions to push.\n')
2407
        else:
2408
            to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2409
        self._show_tag_conficts(to_file)
2410
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2411
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2412
class BranchCheckResult(object):
2413
    """Results of checking branch consistency.
2414
2415
    :see: Branch.check
2416
    """
2417
2418
    def __init__(self, branch):
2419
        self.branch = branch
2420
2421
    def report_results(self, verbose):
2422
        """Report the check results via trace.note.
2423
        
2424
        :param verbose: Requests more detailed display of what was checked,
2425
            if any.
2426
        """
2427
        note('checked branch %s format %s',
2428
             self.branch.base,
2429
             self.branch._format)
2430
2431
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2432
class Converter5to6(object):
2433
    """Perform an in-place upgrade of format 5 to format 6"""
2434
2435
    def convert(self, branch):
2436
        # Data for 5 and 6 can peacefully coexist.
2437
        format = BzrBranchFormat6()
2438
        new_branch = format.open(branch.bzrdir, _found=True)
2439
2440
        # 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.
2441
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2442
        new_branch.set_parent(branch.get_parent())
2443
        new_branch.set_bound_location(branch.get_bound_location())
2444
        new_branch.set_push_location(branch.get_push_location())
2445
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2446
        # New branch has no tags by default
2447
        new_branch.tags._set_tag_dict({})
2448
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2449
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2450
        new_branch._transport.put_bytes('format',
2451
            format.get_format_string(),
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
2452
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2453
2454
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2455
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2456
        try:
2457
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
2458
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2459
            pass
2460
        branch.set_bound_location(None)
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
2461
2462
2463
class Converter6to7(object):
2464
    """Perform an in-place upgrade of format 6 to format 7"""
2465
2466
    def convert(self, branch):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
2467
        format = BzrBranchFormat7()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2468
        branch._set_config_location('stacked_on_location', '')
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
2469
        # update target format
3221.13.5 by Ian Clatworthy
fix LockableFiles deprecations
2470
        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()
2471
2472
2473
2474
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2475
    """Run ``callable(*args, **kwargs)``, write-locking target for the
2476
    duration.
2477
2478
    _run_with_write_locked_target will attempt to release the lock it acquires.
2479
2480
    If an exception is raised by callable, then that exception *will* be
2481
    propagated, even if the unlock attempt raises its own error.  Thus
2482
    _run_with_write_locked_target should be preferred to simply doing::
2483
2484
        target.lock_write()
2485
        try:
2486
            return callable(*args, **kwargs)
2487
        finally:
2488
            target.unlock()
2489
    
2490
    """
2491
    # This is very similar to bzrlib.decorators.needs_write_lock.  Perhaps they
2492
    # should share code?
2493
    target.lock_write()
2494
    try:
2495
        result = callable(*args, **kwargs)
2496
    except:
2497
        exc_info = sys.exc_info()
2498
        try:
2499
            target.unlock()
2500
        finally:
2501
            raise exc_info[0], exc_info[1], exc_info[2]
2502
    else:
2503
        target.unlock()
2504
        return result