/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'] = []
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1112
        # Introduced in 1.6
1113
        # Invoked before the tip of a branch changes.
1114
        # the api signature is
1115
        # (params) where params is a ChangeBranchTipParams with the members
1116
        # (branch, old_revno, new_revno, old_revid, new_revid)
1117
        self['pre_change_branch_tip'] = []
3331.1.1 by James Henstridge
Add set_last_revision_info hook.
1118
        # Introduced in 1.4
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1119
        # Invoked after the tip of a branch changes.
1120
        # the api signature is
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1121
        # (params) where params is a ChangeBranchTipParams with the members
1122
        # (branch, old_revno, new_revno, old_revid, new_revid)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1123
        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.
1124
1125
1126
# install the default hooks into the Branch class.
1127
Branch.hooks = BranchHooks()
1128
1129
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1130
class ChangeBranchTipParams(object):
1131
    """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()
1132
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1133
    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()
1134
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1135
    :ivar branch: the branch being changed
1136
    :ivar old_revno: revision number before the change
1137
    :ivar new_revno: revision number after the change
1138
    :ivar old_revid: revision id before the change
1139
    :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()
1140
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1141
    The revid fields are strings. The revno fields are integers.
1142
    """
1143
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1144
    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
1145
        """Create a group of ChangeBranchTip parameters.
1146
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1147
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1148
        :param old_revno: Revision number before the change.
1149
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1150
        :param old_revid: Tip revision id before the change.
1151
        :param new_revid: Tip revision id after the change.
1152
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1153
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1154
        self.old_revno = old_revno
1155
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1156
        self.old_revid = old_revid
1157
        self.new_revid = new_revid
1158
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1159
    def __eq__(self, other):
1160
        return self.__dict__ == other.__dict__
1161
    
1162
    def __repr__(self):
1163
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1164
            self.__class__.__name__, self.branch, 
1165
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1166
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1167
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1168
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1169
    """Bzr branch format 4.
1170
1171
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1172
     - 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.
1173
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1174
    """
1175
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1176
    def get_format_description(self):
1177
        """See BranchFormat.get_format_description()."""
1178
        return "Branch format 4"
1179
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1180
    def initialize(self, a_bzrdir):
1181
        """Create a branch of this format in a_bzrdir."""
1182
        utf8_files = [('revision-history', ''),
1183
                      ('branch-name', ''),
1184
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1185
        return self._initialize_helper(a_bzrdir, utf8_files,
1186
                                       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.
1187
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1188
    def __init__(self):
1189
        super(BzrBranchFormat4, self).__init__()
1190
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1191
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1192
    def open(self, a_bzrdir, _found=False):
1193
        """Return the branch object for a_bzrdir
1194
1195
        _found is a private parameter, do not use it. It is used to indicate
1196
               if format probing has already be done.
1197
        """
1198
        if not _found:
1199
            # we are being called directly and must probe.
1200
            raise NotImplementedError
1201
        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.
1202
                         _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.
1203
                         a_bzrdir=a_bzrdir,
1204
                         _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.
1205
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1206
    def __str__(self):
1207
        return "Bazaar-NG branch format 4"
1208
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1209
1210
class BzrBranchFormat5(BranchFormat):
1211
    """Bzr branch format 5.
1212
1213
    This format has:
1214
     - a revision-history file.
1215
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1216
     - a lock dir guarding the branch itself
1217
     - 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.
1218
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1219
1220
    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.
1221
    """
1222
1223
    def get_format_string(self):
1224
        """See BranchFormat.get_format_string()."""
1225
        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
1226
1227
    def get_format_description(self):
1228
        """See BranchFormat.get_format_description()."""
1229
        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.
1230
        
1231
    def initialize(self, a_bzrdir):
1232
        """Create a branch of this format in a_bzrdir."""
1233
        utf8_files = [('revision-history', ''),
1234
                      ('branch-name', ''),
1235
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1236
        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.
1237
1238
    def __init__(self):
1239
        super(BzrBranchFormat5, self).__init__()
1240
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1241
1242
    def open(self, a_bzrdir, _found=False):
1243
        """Return the branch object for a_bzrdir
1244
1245
        _found is a private parameter, do not use it. It is used to indicate
1246
               if format probing has already be done.
1247
        """
1248
        if not _found:
1249
            format = BranchFormat.find_format(a_bzrdir)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1250
            if format.__class__ != self.__class__:
1251
                raise AssertionError("wrong format %r found for %r" %
1252
                    (format, self))
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1253
        try:
1254
            transport = a_bzrdir.get_branch_transport(None)
1752.2.86 by Andrew Bennetts
Merge from bzr.dev.
1255
            control_files = lockable_files.LockableFiles(transport, 'lock',
1256
                                                         lockdir.LockDir)
1752.2.52 by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories.
1257
            return BzrBranch5(_format=self,
1258
                              _control_files=control_files,
1259
                              a_bzrdir=a_bzrdir,
1260
                              _repository=a_bzrdir.find_repository())
3236.1.2 by Michael Hudson
clean up branch.py imports
1261
        except errors.NoSuchFile:
1262
            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.
1263
2220.2.10 by Martin Pool
(broken) start moving things to branches
1264
2230.3.1 by Aaron Bentley
Get branch6 creation working
1265
class BzrBranchFormat6(BzrBranchFormat5):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1266
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1267
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1268
    Unlike previous formats, this has no explicit revision history. Instead,
1269
    this just stores the last-revision, and the left-hand history leading
1270
    up to there is the history.
1271
1272
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1273
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
1274
    """
1275
1276
    def get_format_string(self):
1277
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1278
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
1279
1280
    def get_format_description(self):
1281
        """See BranchFormat.get_format_description()."""
1282
        return "Branch format 6"
1283
1284
    def initialize(self, a_bzrdir):
1285
        """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
1286
        utf8_files = [('last-revision', '0 null:\n'),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1287
                      ('branch.conf', ''),
1288
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1289
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1290
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1291
1292
    def open(self, a_bzrdir, _found=False):
1293
        """Return the branch object for a_bzrdir
1294
1295
        _found is a private parameter, do not use it. It is used to indicate
1296
               if format probing has already be done.
1297
        """
1298
        if not _found:
1299
            format = BranchFormat.find_format(a_bzrdir)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1300
            if format.__class__ != self.__class__:
1301
                raise AssertionError("wrong format %r found for %r" %
1302
                    (format, self))
2230.3.1 by Aaron Bentley
Get branch6 creation working
1303
        transport = a_bzrdir.get_branch_transport(None)
1304
        control_files = lockable_files.LockableFiles(transport, 'lock',
1305
                                                     lockdir.LockDir)
1306
        return BzrBranch6(_format=self,
1307
                          _control_files=control_files,
1308
                          a_bzrdir=a_bzrdir,
1309
                          _repository=a_bzrdir.find_repository())
1310
2220.2.27 by Martin Pool
Start adding tags to Branch6
1311
    def supports_tags(self):
1312
        return True
1313
2230.3.1 by Aaron Bentley
Get branch6 creation working
1314
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.
1315
class BranchReferenceFormat(BranchFormat):
1316
    """Bzr branch reference format.
1317
1318
    Branch references are used in implementing checkouts, they
1319
    act as an alias to the real branch which is at some other url.
1320
1321
    This format has:
1322
     - A location file
1323
     - a format string
1324
    """
1325
1326
    def get_format_string(self):
1327
        """See BranchFormat.get_format_string()."""
1328
        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
1329
1330
    def get_format_description(self):
1331
        """See BranchFormat.get_format_description()."""
1332
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1333
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1334
    def get_reference(self, a_bzrdir):
1335
        """See BranchFormat.get_reference()."""
1336
        transport = a_bzrdir.get_branch_transport(None)
1337
        return transport.get('location').read()
1338
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1339
    def set_reference(self, a_bzrdir, to_branch):
1340
        """See BranchFormat.set_reference()."""
1341
        transport = a_bzrdir.get_branch_transport(None)
1342
        location = transport.put_bytes('location', to_branch.base)
1343
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
    def initialize(self, a_bzrdir, target_branch=None):
1345
        """Create a branch of this format in a_bzrdir."""
1346
        if target_branch is None:
1347
            # this format does not implement branch itself, thus the implicit
1348
            # creation contract must see it as uninitializable
1349
            raise errors.UninitializableFormat(self)
1350
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1351
        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
1352
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1353
            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
1354
        branch_transport.put_bytes('format', self.get_format_string())
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1355
        return self.open(
1356
            a_bzrdir, _found=True,
1357
            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.
1358
1359
    def __init__(self):
1360
        super(BranchReferenceFormat, self).__init__()
1361
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1362
1363
    def _make_reference_clone_function(format, a_branch):
1364
        """Create a clone() routine for a branch dynamically."""
1365
        def clone(to_bzrdir, revision_id=None):
1366
            """See Branch.clone()."""
1367
            return format.initialize(to_bzrdir, a_branch)
1368
            # cannot obey revision_id limits when cloning a reference ...
1369
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1370
            # emit some sort of warning/error to the caller ?!
1371
        return clone
1372
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1373
    def open(self, a_bzrdir, _found=False, location=None,
1374
             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.
1375
        """Return the branch that the branch reference in a_bzrdir points at.
1376
1377
        _found is a private parameter, do not use it. It is used to indicate
1378
               if format probing has already be done.
1379
        """
1380
        if not _found:
1381
            format = BranchFormat.find_format(a_bzrdir)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1382
            if format.__class__ != self.__class__:
1383
                raise AssertionError("wrong format %r found for %r" %
1384
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1385
        if location is None:
1386
            location = self.get_reference(a_bzrdir)
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1387
        real_bzrdir = bzrdir.BzrDir.open(
1388
            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.
1389
        result = real_bzrdir.open_branch()
1390
        # this changes the behaviour of result.clone to create a new reference
1391
        # rather than a copy of the content of the branch.
1392
        # I did not use a proxy object because that needs much more extensive
1393
        # testing, and we are only changing one behaviour at the moment.
1394
        # If we decide to alter more behaviours - i.e. the implicit nickname
1395
        # then this should be refactored to introduce a tested proxy branch
1396
        # and a subclass of that for use in overriding clone() and ....
1397
        # - RBC 20060210
1398
        result.clone = self._make_reference_clone_function(result)
1399
        return result
1400
1401
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1402
# formats which have no format string are not discoverable
1403
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1404
__format5 = BzrBranchFormat5()
1405
__format6 = BzrBranchFormat6()
1406
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.
1407
BranchFormat.register_format(BranchReferenceFormat())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1408
BranchFormat.register_format(__format6)
1409
BranchFormat.set_default_format(__format6)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1410
_legacy_formats = [BzrBranchFormat4(),
1411
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1412
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1413
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1414
    """A branch stored in the actual filesystem.
1415
1416
    Note that it's "local" in the context of the filesystem; it doesn't
1417
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1418
    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
1419
1420
    :ivar _transport: Transport for file operations on this branch's 
1421
        control files, typically pointing to the .bzr/branch directory.
1422
    :ivar repository: Repository for this branch.
1423
    :ivar base: The url of the base directory for this branch; the one 
1424
        containing the .bzr directory.
1 by mbp at sourcefrog
import from baz patch-364
1425
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1426
    
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1427
    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.
1428
                 _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)
1429
        """Create new branch object at a particular location."""
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
1430
        Branch.__init__(self)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1431
        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)
1432
            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.
1433
        else:
1434
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1435
        self._base = self.bzrdir.transport.clone('..').base
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1436
        # XXX: We should be able to just do
1437
        #   self.base = self.bzrdir.root_transport.base
1438
        # but this does not quite work yet -- mbp 20080522
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1439
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1440
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1441
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1442
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1443
        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.
1444
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1445
1 by mbp at sourcefrog
import from baz patch-364
1446
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1447
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1448
1449
    __repr__ = __str__
1450
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1451
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1452
        """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
1453
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1454
1442.1.5 by Robert Collins
Give branch.base a docstring.
1455
    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,
1456
3407.2.11 by Martin Pool
Deprecate Branch.abspath
1457
    @deprecated_method(deprecated_in((0, 16, 0)))
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1458
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1459
        """See Branch.abspath."""
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1460
        return self._transport.abspath(name)
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
1461
1694.2.6 by Martin Pool
[merge] bzr.dev
1462
    def is_locked(self):
1463
        return self.control_files.is_locked()
1464
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).
1465
    def lock_write(self, token=None):
1466
        repo_token = self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1467
        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).
1468
            token = self.control_files.lock_write(token=token)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1469
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1470
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1471
            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).
1472
        return token
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1473
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1474
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1475
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1476
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1477
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1478
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1479
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1480
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1481
1482
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1483
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1484
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1485
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1486
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1487
            self.repository.unlock()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1488
        if not self.control_files.is_locked():
1489
            # we just released the lock
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1490
            self._clear_cached_state()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1491
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1492
    def peek_lock_mode(self):
1493
        if self.control_files._lock_count == 0:
1494
            return None
1495
        else:
1496
            return self.control_files._lock_mode
1497
1694.2.6 by Martin Pool
[merge] bzr.dev
1498
    def get_physical_lock_status(self):
1499
        return self.control_files.get_physical_lock_status()
1500
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1501
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1502
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1503
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1504
        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.
1505
2230.3.49 by Aaron Bentley
Fix cache updating
1506
    def _write_revision_history(self, history):
1507
        """Factored out of set_revision_history.
1508
1509
        This performs the actual writing to disk.
1510
        It is intended to be called by BzrBranch5.set_revision_history."""
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1511
        self._transport.put_bytes(
1512
            'revision-history', '\n'.join(history),
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1513
            mode=self.bzrdir._get_file_mode())
2230.3.49 by Aaron Bentley
Fix cache updating
1514
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1515
    @needs_write_lock
1516
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1517
        """See Branch.set_revision_history."""
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1518
        if 'evil' in debug.debug_flags:
1519
            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.
1520
        check_not_reserved_id = _mod_revision.check_not_reserved_id
1521
        for rev_id in rev_history:
1522
            check_not_reserved_id(rev_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1523
        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.
1524
        self._clear_cached_state()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1525
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1526
        for hook in Branch.hooks['set_rh']:
1527
            hook(self, rev_history)
233 by mbp at sourcefrog
- more output from test.sh
1528
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1529
    def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1530
        """Run the pre_change_branch_tip hooks."""
1531
        hooks = Branch.hooks['pre_change_branch_tip']
1532
        if not hooks:
1533
            return
1534
        old_revno, old_revid = self.last_revision_info()
1535
        params = ChangeBranchTipParams(
1536
            self, old_revno, new_revno, old_revid, new_revid)
1537
        for hook in hooks:
1538
            hook(params)
1539
 
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1540
    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
1541
        """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.
1542
        hooks = Branch.hooks['post_change_branch_tip']
1543
        if not hooks:
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1544
            return
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1545
        new_revno, new_revid = self.last_revision_info()
1546
        params = ChangeBranchTipParams(
1547
            self, old_revno, new_revno, old_revid, new_revid)
1548
        for hook in hooks:
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1549
            hook(params)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1550
 
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1551
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1552
    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
1553
        """Set the last revision of this branch.
1554
1555
        The caller is responsible for checking that the revno is correct
1556
        for this revision id.
1557
1558
        It may be possible to set the branch last revision to an id not
1559
        present in the repository.  However, branches can also be 
1560
        configured to check constraints on history, in which case this may not
1561
        be permitted.
1562
        """
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
1563
        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.
1564
        old_revno, old_revid = self.last_revision_info()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1565
        # this old format stores the full history, but this api doesn't
1566
        # provide it, so we must generate, and might as well check it's
1567
        # correct
2697.2.5 by Martin Pool
Kill off append_revision
1568
        history = self._lefthand_history(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1569
        if len(history) != revno:
1570
            raise AssertionError('%d != %d' % (len(history), revno))
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1571
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1572
        self.set_revision_history(history)
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1573
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1574
2230.4.1 by Aaron Bentley
Get log as fast branch5
1575
    def _gen_revision_history(self):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
1576
        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.
1577
        if history[-1:] == ['']:
1578
            # There shouldn't be a trailing newline, but just in case.
1579
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
1580
        return history
1581
2230.3.2 by Aaron Bentley
Get all branch tests passing
1582
    def _lefthand_history(self, revision_id, last_rev=None,
1583
                          other_branch=None):
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1584
        if 'evil' in debug.debug_flags:
1585
            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.
1586
        # stop_revision must be a descendant of last_revision
3240.1.3 by Aaron Bentley
Use Graph to generate revision_history
1587
        graph = self.repository.get_graph()
1588
        if last_rev is not None:
1589
            if not graph.is_ancestor(last_rev, revision_id):
1590
                # our previous tip is not merged into stop_revision
1591
                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.
1592
        # make a new revision history from the graph
3240.1.4 by Aaron Bentley
Simplify _lefthand_history code
1593
        parents_map = graph.get_parent_map([revision_id])
1594
        if revision_id not in parents_map:
1595
            raise errors.NoSuchRevision(self, revision_id)
1596
        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.
1597
        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.
1598
        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
1599
        # Do not include ghosts or graph origin in revision_history
1600
        while (current_rev_id in parents_map and
1601
               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.
1602
            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.
1603
            new_history.append(current_rev_id)
3240.1.5 by Aaron Bentley
Further clean-ups, move None conversion out into API functions
1604
            current_rev_id = parents_map[current_rev_id][0]
3240.1.4 by Aaron Bentley
Simplify _lefthand_history code
1605
            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.
1606
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1607
        return new_history
1608
1609
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1610
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1611
        other_branch=None):
1612
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1613
2230.3.2 by Aaron Bentley
Get all branch tests passing
1614
        :param revision_id: the new tip to use.
1615
        :param last_rev: The previous last_revision. If not None, then this
1616
            must be a ancestory of revision_id, or DivergedBranches is raised.
1617
        :param other_branch: The other branch that DivergedBranches should
1618
            raise with respect to.
1619
        """
1620
        self.set_revision_history(self._lefthand_history(revision_id,
1621
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1622
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1623
    def basis_tree(self):
1624
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1625
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1626
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1627
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1628
    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.
1629
             _hook_master=None, run_hooks=True, possible_transports=None,
1630
             _override_hook_target=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1631
        """See Branch.pull.
1632
1633
        :param _hook_master: Private parameter - set the branch to 
3489.2.7 by Andrew Bennetts
Update comments and docstrings, add NEWS entry.
1634
            be supplied as the master to pull hooks.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1635
        :param run_hooks: Private parameter - if false, this branch
1636
            is being called because it's the master of the primary branch,
1637
            so it should not run its hooks.
3489.2.7 by Andrew Bennetts
Update comments and docstrings, add NEWS entry.
1638
        :param _override_hook_target: Private parameter - set the branch to be
1639
            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
1640
        """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1641
        result = PullResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1642
        result.source_branch = source
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1643
        if _override_hook_target is None:
1644
            result.target_branch = self
1645
        else:
1646
            result.target_branch = _override_hook_target
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1647
        source.lock_read()
1648
        try:
3445.1.6 by John Arbash Meinel
Start using the 'graph' parameter of update_revisions to bias push and pull checking
1649
            # We assume that during 'pull' the local repository is closer than
1650
            # the remote one.
1651
            graph = self.repository.get_graph(source.repository)
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1652
            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
1653
            self.update_revisions(source, stop_revision, overwrite=overwrite,
1654
                                  graph=graph)
2804.3.1 by Lukáš Lalinský
Overwrite conflicting tags by push|pull --overwrite.
1655
            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.
1656
            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.
1657
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1658
                result.master_branch = _hook_master
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1659
                result.local_branch = result.target_branch
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1660
            else:
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1661
                result.master_branch = result.target_branch
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1662
                result.local_branch = None
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1663
            if run_hooks:
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1664
                for hook in Branch.hooks['post_pull']:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1665
                    hook(result)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1666
        finally:
1667
            source.unlock()
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1668
        return result
1 by mbp at sourcefrog
import from baz patch-364
1669
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1670
    def _get_parent_location(self):
1671
        _locs = ['parent', 'pull', 'x-pull']
1672
        for l in _locs:
1673
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
1674
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
1675
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1676
                pass
1677
        return None
1678
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1679
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1680
    def push(self, target, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1681
             _override_hook_source_branch=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1682
        """See Branch.push.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1683
1684
        This is the basic concrete implementation of push()
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1685
1686
        :param _override_hook_source_branch: If specified, run
1687
        the hooks passing this Branch as the source, rather than self.  
1688
        This is for use of RemoteBranch, where push is delegated to the
1689
        underlying vfs-based Branch. 
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1690
        """
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1691
        # TODO: Public option to disable running hooks - should be trivial but
1692
        # needs tests.
1693
        target.lock_write()
1694
        try:
1695
            result = self._push_with_bound_branches(target, overwrite,
1696
                    stop_revision,
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1697
                    _override_hook_source_branch=_override_hook_source_branch)
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1698
            return result
1699
        finally:
1700
            target.unlock()
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1701
1702
    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
1703
            stop_revision,
1704
            _override_hook_source_branch=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1705
        """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)
1706
        
1707
        This is on the base BzrBranch class even though it doesn't support 
1708
        bound branches because the *target* might be bound.
1709
        """
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1710
        def _run_hooks():
1711
            if _override_hook_source_branch:
1712
                result.source_branch = _override_hook_source_branch
1713
            for hook in Branch.hooks['post_push']:
1714
                hook(result)
1715
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1716
        bound_location = target.get_bound_location()
1717
        if bound_location and target.base != bound_location:
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1718
            # there is a master branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1719
            #
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1720
            # XXX: Why the second check?  Is it even supported for a branch to
1721
            # be bound to itself? -- mbp 20070507
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1722
            master_branch = target.get_master_branch()
1723
            master_branch.lock_write()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1724
            try:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1725
                # push into the master from this branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1726
                self._basic_push(master_branch, overwrite, stop_revision)
1727
                # and push into the target branch from this. Note that we push from
1728
                # this branch again, because its considered the highest bandwidth
1729
                # repository.
1730
                result = self._basic_push(target, overwrite, stop_revision)
1731
                result.master_branch = master_branch
1732
                result.local_branch = target
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1733
                _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1734
                return result
1735
            finally:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1736
                master_branch.unlock()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1737
        else:
1738
            # no master branch
1739
            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
1740
            # TODO: Why set master_branch and local_branch if there's no
1741
            # binding?  Maybe cleaner to just leave them unset? -- mbp
1742
            # 20070504
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1743
            result.master_branch = target
1744
            result.local_branch = None
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1745
            _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1746
            return result
1747
1748
    def _basic_push(self, target, overwrite, stop_revision):
1749
        """Basic implementation of push without bound branches or hooks.
1750
1751
        Must be called with self read locked and target write locked.
1752
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1753
        result = PushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1754
        result.source_branch = self
1755
        result.target_branch = target
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
1756
        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
1757
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
1758
        # We assume that during 'push' this repository is closer than
1759
        # the target.
3445.1.6 by John Arbash Meinel
Start using the 'graph' parameter of update_revisions to bias push and pull checking
1760
        graph = self.repository.get_graph(target.repository)
1761
        target.update_revisions(self, stop_revision, overwrite=overwrite,
1762
                                graph=graph)
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
1763
        result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1764
        result.new_revno, result.new_revid = target.last_revision_info()
1765
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1766
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1767
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1768
        """See Branch.get_parent."""
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1769
        parent = self._get_parent_location()
1770
        if parent is None:
1771
            return parent
1772
        # This is an old-format absolute path to a local branch
1773
        # turn it into a url
1774
        if parent.startswith('/'):
1775
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1776
        try:
1777
            return urlutils.join(self.base[:-1], parent)
1778
        except errors.InvalidURLJoin, e:
1779
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1780
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1781
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1782
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1783
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1784
            'push_location', location,
1785
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1786
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1787
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1788
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1789
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1790
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1791
        # URLs should never be unicode, even on the local fs,
1792
        # 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
1793
        # read and rewrite the file. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1794
        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
1795
            if isinstance(url, unicode):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1796
                try:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1797
                    url = url.encode('ascii')
1798
                except UnicodeEncodeError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1799
                    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
1800
                        "Urls must be 7-bit ascii, "
1801
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1802
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1803
        self._set_parent_location(url)
1804
1805
    def _set_parent_location(self, url):
1806
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1807
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1808
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1809
            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
1810
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
1811
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1812
1813
class BzrBranch5(BzrBranch):
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1814
    """A format 5 branch. This supports new features over plain branches.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1815
1816
    It has support for a master_branch which is the data for bound branches.
1817
    """
1818
1819
    def __init__(self,
1820
                 _format,
1821
                 _control_files,
1822
                 a_bzrdir,
1823
                 _repository):
1824
        super(BzrBranch5, self).__init__(_format=_format,
1825
                                         _control_files=_control_files,
1826
                                         a_bzrdir=a_bzrdir,
1827
                                         _repository=_repository)
1828
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1829
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1830
    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.
1831
             run_hooks=True, possible_transports=None,
1832
             _override_hook_target=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1833
        """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
1834
        
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1835
        :param run_hooks: Private parameter - if false, this branch
1836
            is being called because it's the master of the primary branch,
1837
            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
1838
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1839
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1840
        master_branch = None
1841
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1842
            # not pulling from master, so we need to update master.
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1843
            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
1844
            master_branch.lock_write()
1845
        try:
1846
            if master_branch:
1847
                # pull from source into master.
1848
                master_branch.pull(source, overwrite, stop_revision,
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1849
                    run_hooks=False)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1850
            return super(BzrBranch5, self).pull(source, overwrite,
1851
                stop_revision, _hook_master=master_branch,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1852
                run_hooks=run_hooks,
1853
                _override_hook_target=_override_hook_target)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1854
        finally:
1855
            if master_branch:
1856
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1857
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1858
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1859
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
1860
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1861
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1862
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1863
1864
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1865
    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
1866
        """Return the branch we are bound to.
1867
        
1868
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1869
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1870
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1871
        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.
1872
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1873
        # 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
1874
        """
1875
        bound_loc = self.get_bound_location()
1876
        if not bound_loc:
1877
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1878
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1879
            return Branch.open(bound_loc,
1880
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1881
        except (errors.NotBranchError, errors.ConnectionError), e:
1882
            raise errors.BoundBranchConnectionFailure(
1883
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1884
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1885
    @needs_write_lock
1886
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1887
        """Set the target where this branch is bound to.
1888
1889
        :param location: URL to the target branch
1890
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1891
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1892
            self._transport.put_bytes('bound', location+'\n',
1893
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1894
        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.
1895
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1896
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
1897
            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.
1898
                return False
1899
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1900
1901
    @needs_write_lock
1902
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1903
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1904
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1905
        This does not push or pull data between the branches, though it does
1906
        check for divergence to raise an error when the branches are not
1907
        either the same, or one a prefix of the other. That behaviour may not
1908
        be useful, so that check may be removed in future.
1909
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1910
        :param other: The branch to bind to
1911
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1912
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1913
        # TODO: jam 20051230 Consider checking if the target is bound
1914
        #       It is debatable whether you should be able to bind to
1915
        #       a branch which is itself bound.
1916
        #       Committing is obviously forbidden,
1917
        #       but binding itself may not be.
1918
        #       Since we *have* to check at commit time, we don't
1919
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1920
1921
        # we want to raise diverged if:
1922
        # last_rev is not in the other_last_rev history, AND
1923
        # other_last_rev is not in our history, and do it without pulling
1924
        # history around
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1925
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1926
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1927
    @needs_write_lock
1928
    def unbind(self):
1929
        """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.
1930
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1931
1587.1.10 by Robert Collins
update updates working tree and branch together.
1932
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1933
    def update(self, possible_transports=None):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1934
        """Synchronise this branch with the master branch if any. 
1935
1936
        :return: None or the last_revision that was pivoted out during the
1937
                 update.
1938
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1939
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
1940
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
1941
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
1942
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
1943
            if self.repository.get_graph().is_ancestor(old_tip,
1944
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1945
                return None
1946
            return old_tip
1947
        return None
1948
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1949
2230.3.1 by Aaron Bentley
Get branch6 creation working
1950
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1951
3298.2.2 by John Arbash Meinel
some small cleanups.
1952
    def __init__(self, *args, **kwargs):
1953
        super(BzrBranch6, self).__init__(*args, **kwargs)
3298.2.10 by Aaron Bentley
Refactor partial history code
1954
        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.
1955
1956
    def _clear_cached_state(self):
1957
        super(BzrBranch6, self)._clear_cached_state()
3298.2.10 by Aaron Bentley
Refactor partial history code
1958
        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.
1959
3298.2.10 by Aaron Bentley
Refactor partial history code
1960
    def _last_revision_info(self):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1961
        revision_string = self._transport.get_bytes('last-revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
1962
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
1963
        revision_id = cache_utf8.get_cached_utf8(revision_id)
1964
        revno = int(revno)
1965
        return revno, revision_id
1966
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1967
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
1968
        """Simply write out the revision id, with no checks.
1969
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1970
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
1971
1972
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1973
        Intended to be called by set_last_revision_info and
1974
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
1975
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1976
        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
1977
        out_string = '%d %s\n' % (revno, revision_id)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1978
        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
1979
            mode=self.bzrdir._get_file_mode())
2230.3.2 by Aaron Bentley
Get all branch tests passing
1980
2230.3.49 by Aaron Bentley
Fix cache updating
1981
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1982
    def set_last_revision_info(self, revno, revision_id):
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
1983
        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.
1984
        old_revno, old_revid = self.last_revision_info()
2230.3.49 by Aaron Bentley
Fix cache updating
1985
        if self._get_append_revisions_only():
1986
            self._check_history_violation(revision_id)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1987
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1988
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1989
        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.
1990
        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.
1991
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.3.49 by Aaron Bentley
Fix cache updating
1992
2230.3.32 by Aaron Bentley
Implement strict history policy
1993
    def _check_history_violation(self, revision_id):
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
1994
        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
1995
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
1996
            return
1997
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1998
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
1999
2230.4.1 by Aaron Bentley
Get log as fast branch5
2000
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2001
        """Generate the revision history from last revision
2002
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2003
        last_revno, last_revision = self.last_revision_info()
2004
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2005
        return list(reversed(self._partial_revision_history_cache))
2006
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2007
    def _extend_partial_history(self, stop_index=None, stop_revision=None):
3298.2.10 by Aaron Bentley
Refactor partial history code
2008
        """Extend the partial history to include a given index
2009
3298.3.1 by Aaron Bentley
Make stop_revision optional for extend_partial_history
2010
        If a stop_index is supplied, stop when that index has been reached.
3298.2.17 by Aaron Bentley
Update from review
2011
        If a stop_revision is supplied, stop when that revision is
2012
        encountered.  Otherwise, stop when the beginning of history is
2013
        reached.
3298.2.10 by Aaron Bentley
Refactor partial history code
2014
3298.2.17 by Aaron Bentley
Update from review
2015
        :param stop_index: The index which should be present.  When it is
2016
            present, history extension will stop.
2017
        :param revision_id: The revision id which should be present.  When
2018
            it is encountered, history extension will stop.
3298.2.10 by Aaron Bentley
Refactor partial history code
2019
        """
2020
        repo = self.repository
2021
        if len(self._partial_revision_history_cache) == 0:
2022
            iterator = repo.iter_reverse_revision_history(self.last_revision())
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2023
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2024
            start_revision = self._partial_revision_history_cache[-1]
2025
            iterator = repo.iter_reverse_revision_history(start_revision)
2026
            #skip the last revision in the list
3298.3.3 by Aaron Bentley
Update from review
2027
            next_revision = iterator.next()
3298.2.10 by Aaron Bentley
Refactor partial history code
2028
        for revision_id in iterator:
2029
            self._partial_revision_history_cache.append(revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2030
            if (stop_index is not None and
2031
                len(self._partial_revision_history_cache) > stop_index):
2032
                break
2033
            if revision_id == stop_revision:
3298.2.10 by Aaron Bentley
Refactor partial history code
2034
                break
2230.3.2 by Aaron Bentley
Get all branch tests passing
2035
2230.3.49 by Aaron Bentley
Fix cache updating
2036
    def _write_revision_history(self, history):
2037
        """Factored out of set_revision_history.
2038
2039
        This performs the actual writing to disk, with format-specific checks.
2040
        It is intended to be called by BzrBranch5.set_revision_history.
2041
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
2042
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
2043
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
2044
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2045
            if history != self._lefthand_history(history[-1]):
2046
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
2047
            last_revision = history[-1]
2048
        if self._get_append_revisions_only():
2049
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2050
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2051
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2052
    @needs_write_lock
2053
    def _set_parent_location(self, url):
2054
        """Set the parent branch"""
2055
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2056
2057
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2058
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2059
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2060
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2061
2062
    def set_push_location(self, location):
2063
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2064
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2065
2066
    def set_bound_location(self, location):
2067
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
2068
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2069
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2070
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2071
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2072
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2073
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2074
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2075
                return True
2076
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2077
            self._set_config_location('bound_location', location,
2078
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2079
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2080
        return True
2081
2082
    def _get_bound_location(self, bound):
2083
        """Return the bound location in the config file.
2084
2085
        Return None if the bound parameter does not match"""
2086
        config = self.get_config()
2087
        config_bound = (config.get_user_option('bound') == 'True')
2088
        if config_bound != bound:
2089
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2090
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2091
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2092
    def get_bound_location(self):
2093
        """See Branch.set_push_location."""
2094
        return self._get_bound_location(True)
2095
2096
    def get_old_bound_location(self):
2097
        """See Branch.get_old_bound_location"""
2098
        return self._get_bound_location(False)
2099
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2100
    def set_append_revisions_only(self, enabled):
2101
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2102
            value = 'True'
2103
        else:
2104
            value = 'False'
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2105
        self.get_config().set_user_option('append_revisions_only', value,
2106
            warn_masked=True)
2230.3.32 by Aaron Bentley
Implement strict history policy
2107
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2108
    def _get_append_revisions_only(self):
2109
        value = self.get_config().get_user_option('append_revisions_only')
2110
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2111
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2112
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2113
        """Synchronize last revision and revision history between branches.
2114
2115
        This version is most efficient when the destination is also a
2116
        BzrBranch6, but works for BzrBranch5, as long as the destination's
2117
        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
2118
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2119
2120
        :param destination: The branch to copy the history into
2121
        :param revision_id: The revision-id to truncate history at.  May
2122
          be None to copy complete history.
2123
        """
2697.2.3 by Martin Pool
More append_revision cleanup; _synchronize_history optimization
2124
        source_revno, source_revision_id = self.last_revision_info()
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2125
        if revision_id is None:
2697.2.3 by Martin Pool
More append_revision cleanup; _synchronize_history optimization
2126
            revno, revision_id = source_revno, source_revision_id
2127
        elif source_revision_id == revision_id:
2128
            # we know the revno without needing to walk all of history
2129
            revno = source_revno
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2130
        else:
2592.3.155 by Robert Collins
Remove some spurious differences with bzr.dev.
2131
            # To figure out the revno for a random revision, we need to build
2132
            # the revision history, and count its length.
2133
            # We don't care about the order, just how long it is.
2134
            # Alternatively, we could start at the current location, and count
2135
            # backwards. But there is no guarantee that we will find it since
2136
            # it may be a merged revision.
2137
            revno = len(list(self.repository.iter_reverse_revision_history(
2138
                                                                revision_id)))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2139
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2140
2220.2.27 by Martin Pool
Start adding tags to Branch6
2141
    def _make_tags(self):
2142
        return BasicTags(self)
2143
3240.1.2 by Aaron Bentley
Add write lock
2144
    @needs_write_lock
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2145
    def generate_revision_history(self, revision_id, last_rev=None,
2146
                                  other_branch=None):
3240.1.6 by Aaron Bentley
Update docs
2147
        """See BzrBranch5.generate_revision_history"""
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2148
        history = self._lefthand_history(revision_id, last_rev, other_branch)
2149
        revno = len(history)
2150
        self.set_last_revision_info(revno, revision_id)
2151
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
2152
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2153
    def get_rev_id(self, revno, history=None):
2154
        """Find the revision id of the specified revno."""
2155
        if revno == 0:
2156
            return _mod_revision.NULL_REVISION
2157
2158
        last_revno, last_revision_id = self.last_revision_info()
2159
        if revno <= 0 or revno > last_revno:
2160
            raise errors.NoSuchRevision(self, revno)
2161
2162
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
2163
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2164
3298.2.10 by Aaron Bentley
Refactor partial history code
2165
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
2166
        if len(self._partial_revision_history_cache) <= index:
2167
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
2168
        if len(self._partial_revision_history_cache) > index:
2169
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2170
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2171
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2172
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2173
    @needs_read_lock
2174
    def revision_id_to_revno(self, revision_id):
2175
        """Given a revision id, return its revno"""
2176
        if _mod_revision.is_null(revision_id):
2177
            return 0
2178
        try:
2179
            index = self._partial_revision_history_cache.index(revision_id)
2180
        except ValueError:
2181
            self._extend_partial_history(stop_revision=revision_id)
2182
            index = len(self._partial_revision_history_cache) - 1
2183
            if self._partial_revision_history_cache[index] != revision_id:
2184
                raise errors.NoSuchRevision(self, revision_id)
2185
        return self.revno() - index
2186
2230.3.34 by Aaron Bentley
cleanup
2187
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2188
######################################################################
2189
# results of operations
2190
2220.2.37 by Martin Pool
Report conflicting tags from push.
2191
2192
class _Result(object):
2193
2194
    def _show_tag_conficts(self, to_file):
2195
        if not getattr(self, 'tag_conflicts', None):
2196
            return
2197
        to_file.write('Conflicting tags:\n')
2198
        for name, value1, value2 in self.tag_conflicts:
2199
            to_file.write('    %s\n' % (name, ))
2200
2201
2202
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2203
    """Result of a Branch.pull operation.
2204
2205
    :ivar old_revno: Revision number before pull.
2206
    :ivar new_revno: Revision number after pull.
2207
    :ivar old_revid: Tip revision id before pull.
2208
    :ivar new_revid: Tip revision id after pull.
2209
    :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.
2210
    :ivar master_branch: Master branch of the target, or the target if no
2211
        Master
2212
    :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
2213
    :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.
2214
    :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
2215
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2216
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2217
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2218
        # DEPRECATED: pull used to return the change in revno
2219
        return self.new_revno - self.old_revno
2220
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2221
    def report(self, to_file):
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
2222
        if not is_quiet():
2223
            if self.old_revid == self.new_revid:
2224
                to_file.write('No revisions to pull.\n')
2225
            else:
2226
                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
2227
        self._show_tag_conficts(to_file)
2228
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2229
2220.2.37 by Martin Pool
Report conflicting tags from push.
2230
class PushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2231
    """Result of a Branch.push operation.
2232
2233
    :ivar old_revno: Revision number before push.
2234
    :ivar new_revno: Revision number after push.
2235
    :ivar old_revid: Tip revision id before push.
2236
    :ivar new_revid: Tip revision id after push.
2237
    :ivar source_branch: Source branch object.
2238
    :ivar master_branch: Master branch of the target, or None.
2239
    :ivar target_branch: Target/destination branch object.
2240
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2241
2242
    def __int__(self):
2243
        # 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()
2244
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2245
2220.2.37 by Martin Pool
Report conflicting tags from push.
2246
    def report(self, to_file):
2247
        """Write a human-readable description of the result."""
2248
        if self.old_revid == self.new_revid:
2249
            to_file.write('No new revisions to push.\n')
2250
        else:
2251
            to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2252
        self._show_tag_conficts(to_file)
2253
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2254
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2255
class BranchCheckResult(object):
2256
    """Results of checking branch consistency.
2257
2258
    :see: Branch.check
2259
    """
2260
2261
    def __init__(self, branch):
2262
        self.branch = branch
2263
2264
    def report_results(self, verbose):
2265
        """Report the check results via trace.note.
2266
        
2267
        :param verbose: Requests more detailed display of what was checked,
2268
            if any.
2269
        """
2270
        note('checked branch %s format %s',
2271
             self.branch.base,
2272
             self.branch._format)
2273
2274
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2275
class Converter5to6(object):
2276
    """Perform an in-place upgrade of format 5 to format 6"""
2277
2278
    def convert(self, branch):
2279
        # Data for 5 and 6 can peacefully coexist.
2280
        format = BzrBranchFormat6()
2281
        new_branch = format.open(branch.bzrdir, _found=True)
2282
2283
        # 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.
2284
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2285
        new_branch.set_parent(branch.get_parent())
2286
        new_branch.set_bound_location(branch.get_bound_location())
2287
        new_branch.set_push_location(branch.get_push_location())
2288
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2289
        # New branch has no tags by default
2290
        new_branch.tags._set_tag_dict({})
2291
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2292
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2293
        new_branch._transport.put_bytes('format',
2294
            format.get_format_string(),
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
2295
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2296
2297
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2298
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2299
        try:
2300
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
2301
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2302
            pass
2303
        branch.set_bound_location(None)