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