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