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