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