/brz/remove-bazaar

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