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