/brz/remove-bazaar

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