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