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