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