/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1
# Copyright (C) 2005, 2006 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,
38
        ui,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
39
        urlutils,
1551.8.4 by Aaron Bentley
Tweak import style
40
        )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
43
""")
44
1534.4.28 by Robert Collins
first cut at merge from integration.
45
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
46
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
47
                           HistoryMissing, InvalidRevisionId,
48
                           InvalidRevisionNumber, LockError, NoSuchFile,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
49
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
50
                           NotBranchError, UninitializableFormat,
51
                           UnlistableStore, UnlistableBranch,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
52
                           )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
53
from bzrlib.symbol_versioning import (deprecated_function,
54
                                      deprecated_method,
55
                                      DEPRECATED_PARAMETER,
56
                                      deprecated_passed,
1770.2.12 by Aaron Bentley
Merge bzr.dev
57
                                      zero_eight, zero_nine,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
58
                                      )
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
59
from bzrlib.trace import mutter, note
1104 by Martin Pool
- Add a simple UIFactory
60
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
61
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
62
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
63
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1429 by Robert Collins
merge in niemeyers prefixed-store patch
64
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
65
66
67
# TODO: Maybe include checks for common corruption of newlines, etc?
1 by mbp at sourcefrog
import from baz patch-364
68
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
69
# TODO: Some operations like log might retrieve the same revisions
70
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
71
# cache in memory to make this faster.  In general anything can be
1185.65.29 by Robert Collins
Implement final review suggestions.
72
# cached in memory between lock and unlock operations. .. nb thats
73
# what the transaction identity map provides
416 by Martin Pool
- bzr log and bzr root now accept an http URL
74
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
75
1 by mbp at sourcefrog
import from baz patch-364
76
######################################################################
77
# branch objects
78
558 by Martin Pool
- All top-level classes inherit from object
79
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
80
    """Branch holding a history of revisions.
81
343 by Martin Pool
doc
82
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
83
        Base directory/url of the branch.
84
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
85
    # this is really an instance variable - FIXME move it there
86
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
87
    base = None
88
89
    def __init__(self, *ignored, **ignored_too):
90
        raise NotImplementedError('The Branch class is abstract')
91
1687.1.8 by Robert Collins
Teach Branch about break_lock.
92
    def break_lock(self):
93
        """Break a lock if one is present from another instance.
94
95
        Uses the ui factory to ask for confirmation if the lock may be from
96
        an active process.
97
98
        This will probe the repository for its lock as well.
99
        """
100
        self.control_files.break_lock()
101
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
102
        master = self.get_master_branch()
103
        if master is not None:
104
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
105
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
106
    @staticmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
107
    @deprecated_method(zero_eight)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
108
    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.
109
        """Open a branch which may be of an old format."""
110
        return Branch.open(base, _unsupported=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
111
        
112
    @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.
113
    def open(base, _unsupported=False):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
114
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
115
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
116
        For instance, if the branch is at URL/.bzr/branch,
117
        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.
118
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
119
        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.
120
        return control.open_branch(_unsupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
121
122
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
123
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
124
        """Open an existing branch which contains url.
125
        
126
        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
127
128
        Basically we keep looking up until we find the control directory or
129
        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.
130
        If there is one and it is either an unrecognised format or an unsupported 
131
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
132
        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.
133
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
134
        control, relpath = bzrdir.BzrDir.open_containing(url)
135
        return control.open_branch(), relpath
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
136
137
    @staticmethod
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
138
    @deprecated_function(zero_eight)
139
    def initialize(base):
140
        """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
141
142
        NOTE: This will soon be deprecated in favour of creation
143
        through a BzrDir.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
144
        """
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.
145
        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.
146
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
147
    @deprecated_function(zero_eight)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
148
    def setup_caching(self, cache_root):
149
        """Subclasses that care about caching should override this, and set
150
        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
151
        
152
        NOTE: This is unused.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
153
        """
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
154
        pass
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
155
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
156
    def get_config(self):
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
157
        return BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
158
1185.35.11 by Aaron Bentley
Added support for branch nicks
159
    def _get_nick(self):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
160
        return self.get_config().get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
161
162
    def _set_nick(self, nick):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
163
        self.get_config().set_user_option('nickname', nick)
1185.35.11 by Aaron Bentley
Added support for branch nicks
164
165
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
166
167
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
168
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
169
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
170
    def lock_write(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
171
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
172
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
173
    def lock_read(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
174
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
175
176
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
177
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
178
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
179
    def peek_lock_mode(self):
180
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
181
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
182
1694.2.6 by Martin Pool
[merge] bzr.dev
183
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
184
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
185
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
186
    def abspath(self, name):
187
        """Return absolute filename for something in the branch
188
        
189
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
190
        method and not a tree method.
191
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
192
        raise NotImplementedError(self.abspath)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
193
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
194
    def bind(self, other):
195
        """Bind the local branch the other branch.
196
197
        :param other: The branch to bind to
198
        :type other: Branch
199
        """
200
        raise errors.UpgradeRequired(self.base)
201
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.
202
    @needs_write_lock
203
    def fetch(self, from_branch, last_revision=None, pb=None):
204
        """Copy revisions from from_branch into this branch.
205
206
        :param from_branch: Where to copy from.
207
        :param last_revision: What revision to stop at (None for at the end
208
                              of the branch.
209
        :param pb: An optional progress bar to use.
210
211
        Returns the copied revision count and the failed revisions in a tuple:
212
        (copied, failures).
213
        """
214
        if self.base == from_branch.base:
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
215
            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.
216
        if pb is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
217
            nested_pb = ui.ui_factory.nested_progress_bar()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
218
            pb = nested_pb
219
        else:
220
            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.
221
222
        from_branch.lock_read()
223
        try:
224
            if last_revision is None:
225
                pb.update('get source history')
226
                from_history = from_branch.revision_history()
227
                if from_history:
228
                    last_revision = from_history[-1]
229
                else:
230
                    # no history in the source branch
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
231
                    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.
232
            return self.repository.fetch(from_branch.repository,
233
                                         revision_id=last_revision,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
234
                                         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.
235
        finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
236
            if nested_pb is not None:
237
                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.
238
            from_branch.unlock()
239
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
240
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
241
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
242
243
        Older format branches cannot bind, please be sure to use a metadir
244
        branch.
245
        """
246
        return None
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
247
    
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
248
    def get_commit_builder(self, parents, config=None, timestamp=None, 
249
                           timezone=None, committer=None, revprops=None, 
250
                           revision_id=None):
251
        """Obtain a CommitBuilder for this branch.
252
        
253
        :param parents: Revision ids of the parents of the new revision.
254
        :param config: Optional configuration to use.
255
        :param timestamp: Optional timestamp recorded for commit.
256
        :param timezone: Optional timezone for timestamp.
257
        :param committer: Optional committer to set for commit.
258
        :param revprops: Optional dictionary of revision properties.
259
        :param revision_id: Optional revision id.
260
        """
261
262
        if config is None:
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
263
            config = self.get_config()
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
264
        
265
        return self.repository.get_commit_builder(self, parents, config, 
266
            timestamp, timezone, committer, revprops, revision_id)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
267
268
    def get_master_branch(self):
269
        """Return the branch we are bound to.
270
        
271
        :return: Either a Branch, or None
272
        """
273
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
274
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
275
    def get_revision_delta(self, revno):
276
        """Return the delta for one revision.
277
278
        The delta is relative to its mainline predecessor, or the
279
        empty tree for revision 1.
280
        """
281
        assert isinstance(revno, int)
282
        rh = self.revision_history()
283
        if not (1 <= revno <= len(rh)):
284
            raise InvalidRevisionNumber(revno)
285
        return self.repository.get_revision_delta(rh[revno-1])
286
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
287
    def get_root_id(self):
288
        """Return the id of this branches root"""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
289
        raise NotImplementedError(self.get_root_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
290
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
291
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
292
        """Print `file` to stdout."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
293
        raise NotImplementedError(self.print_file)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
294
295
    def append_revision(self, *revision_ids):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
296
        raise NotImplementedError(self.append_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
297
298
    def set_revision_history(self, rev_history):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
299
        raise NotImplementedError(self.set_revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
300
301
    def revision_history(self):
302
        """Return sequence of revision hashes on to this branch."""
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
303
        raise NotImplementedError(self.revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
304
305
    def revno(self):
306
        """Return current revision number for this branch.
307
308
        That is equivalent to the number of revisions committed to
309
        this branch.
310
        """
311
        return len(self.revision_history())
312
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
313
    def unbind(self):
314
        """Older format branches cannot bind or unbind."""
315
        raise errors.UpgradeRequired(self.base)
316
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
317
    def last_revision(self):
1819.1.7 by Martin Pool
Fix up code to get revision_id of bzr for benchmark log file
318
        """Return last revision id, or None"""
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
319
        ph = self.revision_history()
320
        if ph:
321
            return ph[-1]
322
        else:
323
            return None
324
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
325
    def missing_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
326
        """Return a list of new revisions that would perfectly fit.
327
        
328
        If self and other have not diverged, return a list of the revisions
329
        present in other, but missing from self.
330
        """
331
        self_history = self.revision_history()
332
        self_len = len(self_history)
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
333
        other_history = other.revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
334
        other_len = len(other_history)
335
        common_index = min(self_len, other_len) -1
336
        if common_index >= 0 and \
337
            self_history[common_index] != other_history[common_index]:
338
            raise DivergedBranches(self, other)
339
340
        if stop_revision is None:
341
            stop_revision = other_len
342
        else:
343
            assert isinstance(stop_revision, int)
344
            if stop_revision > other_len:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
345
                raise errors.NoSuchRevision(self, stop_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
346
        return other_history[self_len:stop_revision]
1185.66.1 by Aaron Bentley
Merged from mainline
347
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
348
    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
349
        """Pull in new perfect-fit revisions.
350
351
        :param other: Another Branch to pull from
352
        :param stop_revision: Updated until the given revision
353
        :return: None
354
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
355
        raise NotImplementedError(self.update_revisions)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
356
357
    def revision_id_to_revno(self, revision_id):
358
        """Given a revision id, return its revno"""
359
        if revision_id is None:
360
            return 0
361
        history = self.revision_history()
362
        try:
363
            return history.index(revision_id) + 1
364
        except ValueError:
365
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
366
367
    def get_rev_id(self, revno, history=None):
368
        """Find the revision id of the specified revno."""
369
        if revno == 0:
370
            return None
371
        if history is None:
372
            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
373
        if revno <= 0 or revno > len(history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
374
            raise bzrlib.errors.NoSuchRevision(self, revno)
375
        return history[revno - 1]
376
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
377
    def pull(self, source, overwrite=False, stop_revision=None):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
378
        raise NotImplementedError(self.pull)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
379
380
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
381
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
382
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
383
384
    def rename_one(self, from_rel, to_rel):
385
        """Rename one file.
386
387
        This can change the directory or the filename or both.
388
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
389
        raise NotImplementedError(self.rename_one)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
390
391
    def move(self, from_paths, to_name):
392
        """Rename files.
393
394
        to_name must exist as a versioned directory.
395
396
        If to_name exists and is a directory, the files are moved into
397
        it, keeping their old names.  If it is a directory, 
398
399
        Note that to_name is only the last component of the new name;
400
        this doesn't change the directory.
401
402
        This returns a list of (from_path, to_path) pairs for each
403
        entry that is moved.
404
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
405
        raise NotImplementedError(self.move)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
406
407
    def get_parent(self):
408
        """Return the parent location of the branch.
409
410
        This is the default location for push/pull/missing.  The usual
411
        pattern is that the user can override it by specifying a
412
        location.
413
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
414
        raise NotImplementedError(self.get_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
415
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
416
    def get_submit_branch(self):
417
        """Return the submit location of the branch.
418
419
        This is the default location for bundle.  The usual
420
        pattern is that the user can override it by specifying a
421
        location.
422
        """
423
        return self.get_config().get_user_option('submit_branch')
424
425
    def set_submit_branch(self, location):
426
        """Return the submit location of the branch.
427
428
        This is the default location for bundle.  The usual
429
        pattern is that the user can override it by specifying a
430
        location.
431
        """
432
        self.get_config().set_user_option('submit_branch', location)
433
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
434
    def get_push_location(self):
435
        """Return the None or the location to push this branch to."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
436
        raise NotImplementedError(self.get_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
437
438
    def set_push_location(self, location):
439
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
440
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
441
442
    def set_parent(self, url):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
443
        raise NotImplementedError(self.set_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
444
1587.1.10 by Robert Collins
update updates working tree and branch together.
445
    @needs_write_lock
446
    def update(self):
447
        """Synchronise this branch with the master branch if any. 
448
449
        :return: None or the last_revision pivoted out during the update.
450
        """
451
        return None
452
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
453
    def check_revno(self, revno):
454
        """\
455
        Check whether a revno corresponds to any revision.
456
        Zero (the NULL revision) is considered valid.
457
        """
458
        if revno != 0:
459
            self.check_real_revno(revno)
460
            
461
    def check_real_revno(self, revno):
462
        """\
463
        Check whether a revno corresponds to a real revision.
464
        Zero (the NULL revision) is considered invalid
465
        """
466
        if revno < 1 or revno > self.revno():
467
            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.
468
469
    @needs_read_lock
470
    def clone(self, *args, **kwargs):
471
        """Clone this branch into to_bzrdir preserving all semantic values.
472
        
473
        revision_id: if not None, the revision history in the new branch will
474
                     be truncated to end with revision_id.
475
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
476
        # for API compatibility, until 0.8 releases we provide the old api:
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.
477
        # def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
478
        # after 0.8 releases, the *args and **kwargs should be changed:
479
        # def clone(self, to_bzrdir, revision_id=None):
480
        if (kwargs.get('to_location', None) or
481
            kwargs.get('revision', None) or
482
            kwargs.get('basis_branch', None) or
483
            (len(args) and isinstance(args[0], basestring))):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
484
            # backwards compatibility api:
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.
485
            warn("Branch.clone() has been deprecated for BzrDir.clone() from"
486
                 " bzrlib 0.8.", DeprecationWarning, stacklevel=3)
487
            # get basis_branch
488
            if len(args) > 2:
489
                basis_branch = args[2]
490
            else:
491
                basis_branch = kwargs.get('basis_branch', None)
492
            if basis_branch:
493
                basis = basis_branch.bzrdir
494
            else:
495
                basis = None
496
            # get revision
497
            if len(args) > 1:
498
                revision_id = args[1]
499
            else:
500
                revision_id = kwargs.get('revision', None)
501
            # get location
502
            if len(args):
503
                url = args[0]
504
            else:
505
                # no default to raise if not provided.
506
                url = kwargs.get('to_location')
507
            return self.bzrdir.clone(url,
508
                                     revision_id=revision_id,
509
                                     basis=basis).open_branch()
510
        # new cleaner api.
511
        # generate args by hand 
512
        if len(args) > 1:
513
            revision_id = args[1]
514
        else:
515
            revision_id = kwargs.get('revision_id', None)
516
        if len(args):
517
            to_bzrdir = args[0]
518
        else:
519
            # no default to raise if not provided.
520
            to_bzrdir = kwargs.get('to_bzrdir')
521
        result = self._format.initialize(to_bzrdir)
522
        self.copy_content_into(result, revision_id=revision_id)
523
        return  result
524
525
    @needs_read_lock
526
    def sprout(self, to_bzrdir, revision_id=None):
527
        """Create a new line of development from the branch, into to_bzrdir.
528
        
529
        revision_id: if not None, the revision history in the new branch will
530
                     be truncated to end with revision_id.
531
        """
532
        result = self._format.initialize(to_bzrdir)
533
        self.copy_content_into(result, revision_id=revision_id)
534
        result.set_parent(self.bzrdir.root_transport.base)
535
        return result
536
537
    @needs_read_lock
538
    def copy_content_into(self, destination, revision_id=None):
539
        """Copy the content of self into destination.
540
541
        revision_id: if not None, the revision history in the new branch will
542
                     be truncated to end with revision_id.
543
        """
2230.3.5 by Aaron Bentley
implement set_last revision and clone
544
        if revision_id is None:
545
            revision_id = self.last_revision()
546
        destination.set_last_revision(revision_id)
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
547
        try:
548
            parent = self.get_parent()
549
        except errors.InaccessibleParent, e:
550
            mutter('parent was not accessible to copy: %s', e)
551
        else:
552
            if parent:
553
                destination.set_parent(parent)
1185.66.1 by Aaron Bentley
Merged from mainline
554
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
555
    @needs_read_lock
556
    def check(self):
557
        """Check consistency of the branch.
558
559
        In particular this checks that revisions given in the revision-history
560
        do actually match up in the revision graph, and that they're all 
561
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
562
        
563
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
564
565
        :return: A BranchCheckResult.
566
        """
567
        mainline_parent_id = None
568
        for revision_id in self.revision_history():
569
            try:
570
                revision = self.repository.get_revision(revision_id)
571
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
572
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
573
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
574
            # In general the first entry on the revision history has no parents.
575
            # But it's not illegal for it to have parents listed; this can happen
576
            # in imports from Arch when the parents weren't reachable.
577
            if mainline_parent_id is not None:
578
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
579
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
580
                                        "parents of {%s}"
581
                                        % (mainline_parent_id, revision_id))
582
            mainline_parent_id = revision_id
583
        return BranchCheckResult(self)
584
1910.2.39 by Aaron Bentley
Fix checkout bug
585
    def _get_checkout_format(self):
586
        """Return the most suitable metadir for a checkout of this branch.
587
        Weaves are used if this branch's repostory uses weaves.
588
        """
589
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
590
            from bzrlib import repository
591
            format = bzrdir.BzrDirMetaFormat1()
592
            format.repository_format = repository.RepositoryFormat7()
593
        else:
1910.2.41 by Aaron Bentley
Clean up clone format creation
594
            format = self.repository.bzrdir.cloning_metadir()
1910.2.39 by Aaron Bentley
Fix checkout bug
595
        return format
596
1551.8.5 by Aaron Bentley
Change name to create_checkout
597
    def create_checkout(self, to_location, revision_id=None, 
598
                        lightweight=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
599
        """Create a checkout of a branch.
600
        
601
        :param to_location: The url to produce the checkout at
602
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
603
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
604
        produce a bound branch (heavyweight checkout)
605
        :return: The tree of the created checkout
606
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
607
        t = transport.get_transport(to_location)
608
        try:
609
            t.mkdir('.')
610
        except errors.FileExists:
611
            pass
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
612
        if lightweight:
613
            checkout = bzrdir.BzrDirMetaFormat1().initialize_on_transport(t)
614
            BranchReferenceFormat().initialize(checkout, self)
615
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
616
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
617
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
618
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
619
            checkout = checkout_branch.bzrdir
620
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
621
            # pull up to the specified revision_id to set the initial 
622
            # branch tip correctly, and seed it with history.
623
            checkout_branch.pull(self, stop_revision=revision_id)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
624
        return checkout.create_workingtree(revision_id)
625
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
626
627
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
628
    """An encapsulation of the initialization and open routines for a format.
629
630
    Formats provide three things:
631
     * An initialization routine,
632
     * a format string,
633
     * an open routine.
634
635
    Formats are placed in an dict by their format string for reference 
636
    during branch opening. Its not required that these be instances, they
637
    can be classes themselves with class methods - it simply depends on 
638
    whether state is needed for a given format or not.
639
640
    Once a format is deprecated, just deprecate the initialize and open
641
    methods on the format class. Do not deprecate the object, as the 
642
    object will be created every time regardless.
643
    """
644
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
645
    _default_format = None
646
    """The default format used for new branches."""
647
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
648
    _formats = {}
649
    """The known formats."""
650
651
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
652
    def find_format(klass, a_bzrdir):
653
        """Return the format for the branch object in a_bzrdir."""
654
        try:
655
            transport = a_bzrdir.get_branch_transport(None)
656
            format_string = transport.get("format").read()
657
            return klass._formats[format_string]
658
        except NoSuchFile:
659
            raise NotBranchError(path=transport.base)
660
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
661
            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.
662
663
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
664
    def get_default_format(klass):
665
        """Return the current default format."""
666
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
667
668
    def get_format_string(self):
669
        """Return the ASCII format string that identifies this format."""
670
        raise NotImplementedError(self.get_format_string)
671
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
672
    def get_format_description(self):
673
        """Return the short format description for this format."""
674
        raise NotImplementedError(self.get_format_string)
675
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
676
    def initialize(self, a_bzrdir):
677
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
678
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
679
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.
680
    def is_supported(self):
681
        """Is this format supported?
682
683
        Supported formats can be initialized and opened.
684
        Unsupported formats may not support initialization or committing or 
685
        some other features depending on the reason for not being supported.
686
        """
687
        return True
688
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
689
    def open(self, a_bzrdir, _found=False):
690
        """Return the branch object for a_bzrdir
691
692
        _found is a private parameter, do not use it. It is used to indicate
693
               if format probing has already be done.
694
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
695
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
696
697
    @classmethod
698
    def register_format(klass, format):
699
        klass._formats[format.get_format_string()] = format
700
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.
701
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
702
    def set_default_format(klass, format):
703
        klass._default_format = format
704
705
    @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.
706
    def unregister_format(klass, format):
707
        assert klass._formats[format.get_format_string()] is format
708
        del klass._formats[format.get_format_string()]
709
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
710
    def __str__(self):
711
        return self.get_format_string().rstrip()
712
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
713
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
714
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
715
    """Bzr branch format 4.
716
717
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
718
     - 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.
719
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
720
    """
721
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
722
    def get_format_description(self):
723
        """See BranchFormat.get_format_description()."""
724
        return "Branch format 4"
725
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
726
    def initialize(self, a_bzrdir):
727
        """Create a branch of this format in a_bzrdir."""
728
        mutter('creating branch in %s', a_bzrdir.transport.base)
729
        branch_transport = a_bzrdir.get_branch_transport(self)
730
        utf8_files = [('revision-history', ''),
731
                      ('branch-name', ''),
732
                      ]
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
733
        control_files = lockable_files.LockableFiles(branch_transport,
734
                             'branch-lock', lockable_files.TransportLock)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
735
        control_files.create_lock()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
736
        control_files.lock_write()
737
        try:
738
            for file, content in utf8_files:
739
                control_files.put_utf8(file, content)
740
        finally:
741
            control_files.unlock()
742
        return self.open(a_bzrdir, _found=True)
743
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
744
    def __init__(self):
745
        super(BzrBranchFormat4, self).__init__()
746
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
747
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
748
    def open(self, a_bzrdir, _found=False):
749
        """Return the branch object for a_bzrdir
750
751
        _found is a private parameter, do not use it. It is used to indicate
752
               if format probing has already be done.
753
        """
754
        if not _found:
755
            # we are being called directly and must probe.
756
            raise NotImplementedError
757
        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.
758
                         _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.
759
                         a_bzrdir=a_bzrdir,
760
                         _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.
761
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
762
    def __str__(self):
763
        return "Bazaar-NG branch format 4"
764
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
765
766
class BzrBranchFormat5(BranchFormat):
767
    """Bzr branch format 5.
768
769
    This format has:
770
     - a revision-history file.
771
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
772
     - a lock dir guarding the branch itself
773
     - 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.
774
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
775
776
    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.
777
    """
778
779
    def get_format_string(self):
780
        """See BranchFormat.get_format_string()."""
781
        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
782
783
    def get_format_description(self):
784
        """See BranchFormat.get_format_description()."""
785
        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.
786
        
787
    def initialize(self, a_bzrdir):
788
        """Create a branch of this format in a_bzrdir."""
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
789
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
790
        branch_transport = a_bzrdir.get_branch_transport(self)
791
        utf8_files = [('revision-history', ''),
792
                      ('branch-name', ''),
793
                      ]
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
794
        control_files = lockable_files.LockableFiles(branch_transport, 'lock',
795
                                                     lockdir.LockDir)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
796
        control_files.create_lock()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
797
        control_files.lock_write()
798
        control_files.put_utf8('format', self.get_format_string())
799
        try:
800
            for file, content in utf8_files:
801
                control_files.put_utf8(file, content)
802
        finally:
803
            control_files.unlock()
804
        return self.open(a_bzrdir, _found=True, )
805
806
    def __init__(self):
807
        super(BzrBranchFormat5, self).__init__()
808
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
809
810
    def open(self, a_bzrdir, _found=False):
811
        """Return the branch object for a_bzrdir
812
813
        _found is a private parameter, do not use it. It is used to indicate
814
               if format probing has already be done.
815
        """
816
        if not _found:
817
            format = BranchFormat.find_format(a_bzrdir)
818
            assert format.__class__ == self.__class__
819
        transport = a_bzrdir.get_branch_transport(None)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
820
        control_files = lockable_files.LockableFiles(transport, 'lock',
821
                                                     lockdir.LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
822
        return BzrBranch5(_format=self,
823
                          _control_files=control_files,
824
                          a_bzrdir=a_bzrdir,
825
                          _repository=a_bzrdir.find_repository())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
826
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
827
    def __str__(self):
828
        return "Bazaar-NG Metadir branch format 5"
829
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
830
2230.3.1 by Aaron Bentley
Get branch6 creation working
831
class BzrBranchFormat6(BzrBranchFormat5):
832
    """Branch format with last-revision
833
    
834
    Unlike previous formats, this has no explicit revision history, instead
835
    the left-parent revision history is used.
836
    """
837
838
    def get_format_string(self):
839
        """See BranchFormat.get_format_string()."""
840
        return "Bazaar-NG branch format 6\n"
841
842
    def get_format_description(self):
843
        """See BranchFormat.get_format_description()."""
844
        return "Branch format 6"
845
846
    def initialize(self, a_bzrdir):
847
        """Create a branch of this format in a_bzrdir."""
848
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
849
        branch_transport = a_bzrdir.get_branch_transport(self)
2230.3.2 by Aaron Bentley
Get all branch tests passing
850
        utf8_files = [('last-revision', 'null:\n'),
2230.3.1 by Aaron Bentley
Get branch6 creation working
851
                      ('branch-name', ''),
852
                      ('branch.conf', '')
853
                      ]
854
        control_files = lockable_files.LockableFiles(branch_transport, 'lock',
855
                                                     lockdir.LockDir)
856
        control_files.create_lock()
857
        control_files.lock_write()
858
        control_files.put_utf8('format', self.get_format_string())
859
        try:
860
            for file, content in utf8_files:
861
                control_files.put_utf8(file, content)
862
        finally:
863
            control_files.unlock()
864
        return self.open(a_bzrdir, _found=True, )
865
866
    def open(self, a_bzrdir, _found=False):
867
        """Return the branch object for a_bzrdir
868
869
        _found is a private parameter, do not use it. It is used to indicate
870
               if format probing has already be done.
871
        """
872
        if not _found:
873
            format = BranchFormat.find_format(a_bzrdir)
874
            assert format.__class__ == self.__class__
875
        transport = a_bzrdir.get_branch_transport(None)
876
        control_files = lockable_files.LockableFiles(transport, 'lock',
877
                                                     lockdir.LockDir)
878
        return BzrBranch6(_format=self,
879
                          _control_files=control_files,
880
                          a_bzrdir=a_bzrdir,
881
                          _repository=a_bzrdir.find_repository())
882
883
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.
884
class BranchReferenceFormat(BranchFormat):
885
    """Bzr branch reference format.
886
887
    Branch references are used in implementing checkouts, they
888
    act as an alias to the real branch which is at some other url.
889
890
    This format has:
891
     - A location file
892
     - a format string
893
    """
894
895
    def get_format_string(self):
896
        """See BranchFormat.get_format_string()."""
897
        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
898
899
    def get_format_description(self):
900
        """See BranchFormat.get_format_description()."""
901
        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.
902
        
903
    def initialize(self, a_bzrdir, target_branch=None):
904
        """Create a branch of this format in a_bzrdir."""
905
        if target_branch is None:
906
            # this format does not implement branch itself, thus the implicit
907
            # creation contract must see it as uninitializable
908
            raise errors.UninitializableFormat(self)
909
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
910
        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
911
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
912
            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
913
        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.
914
        return self.open(a_bzrdir, _found=True)
915
916
    def __init__(self):
917
        super(BranchReferenceFormat, self).__init__()
918
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
919
920
    def _make_reference_clone_function(format, a_branch):
921
        """Create a clone() routine for a branch dynamically."""
922
        def clone(to_bzrdir, revision_id=None):
923
            """See Branch.clone()."""
924
            return format.initialize(to_bzrdir, a_branch)
925
            # cannot obey revision_id limits when cloning a reference ...
926
            # FIXME RBC 20060210 either nuke revision_id for clone, or
927
            # emit some sort of warning/error to the caller ?!
928
        return clone
929
930
    def open(self, a_bzrdir, _found=False):
931
        """Return the branch that the branch reference in a_bzrdir points at.
932
933
        _found is a private parameter, do not use it. It is used to indicate
934
               if format probing has already be done.
935
        """
936
        if not _found:
937
            format = BranchFormat.find_format(a_bzrdir)
938
            assert format.__class__ == self.__class__
939
        transport = a_bzrdir.get_branch_transport(None)
940
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
941
        result = real_bzrdir.open_branch()
942
        # this changes the behaviour of result.clone to create a new reference
943
        # rather than a copy of the content of the branch.
944
        # I did not use a proxy object because that needs much more extensive
945
        # testing, and we are only changing one behaviour at the moment.
946
        # If we decide to alter more behaviours - i.e. the implicit nickname
947
        # then this should be refactored to introduce a tested proxy branch
948
        # and a subclass of that for use in overriding clone() and ....
949
        # - RBC 20060210
950
        result.clone = self._make_reference_clone_function(result)
951
        return result
952
953
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
954
# formats which have no format string are not discoverable
955
# 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.
956
__default_format = BzrBranchFormat5()
957
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.
958
BranchFormat.register_format(BranchReferenceFormat())
2230.3.1 by Aaron Bentley
Get branch6 creation working
959
BranchFormat.register_format(BzrBranchFormat6())
2230.3.6 by Aaron Bentley
work in progress bind stuff
960
BranchFormat.set_default_format(BzrBranchFormat6())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
961
_legacy_formats = [BzrBranchFormat4(),
962
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
963
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
964
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
965
    """A branch stored in the actual filesystem.
966
967
    Note that it's "local" in the context of the filesystem; it doesn't
968
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
969
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
970
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
971
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
972
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
973
                 relax_version_check=DEPRECATED_PARAMETER, _format=None,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
974
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
975
        """Create new branch object at a particular location.
976
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
977
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
978
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
979
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
980
             unversioned directory.  If False, the branch must already
981
             be versioned.
982
1293 by Martin Pool
- add Branch constructor option to relax version check
983
        relax_version_check -- If true, the usual check for the branch
984
            version is not applied.  This is intended only for
985
            upgrade/recovery type use; it's not guaranteed that
986
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
987
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
988
        if a_bzrdir is None:
989
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
990
        else:
991
            self.bzrdir = a_bzrdir
992
        self._transport = self.bzrdir.transport.clone('..')
1534.4.28 by Robert Collins
first cut at merge from integration.
993
        self._base = self._transport.base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
994
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
995
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
996
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
997
        self.control_files = _control_files
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
998
        if deprecated_passed(init):
999
            warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1000
                 "deprecated as of bzr 0.8. Please use Branch.create().",
1001
                 DeprecationWarning,
1002
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1003
            if init:
1004
                # this is slower than before deprecation, oh well never mind.
1005
                # -> its deprecated.
1006
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
1007
        self._check_format(_format)
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.
1008
        if deprecated_passed(relax_version_check):
1009
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1010
                 "relax_version_check parameter is deprecated as of bzr 0.8. "
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1011
                 "Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1012
                 "open() method.",
1013
                 DeprecationWarning,
1014
                 stacklevel=2)
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.
1015
            if (not relax_version_check
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1016
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
1017
                raise errors.UnsupportedFormatError(format=fmt)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1018
        if deprecated_passed(transport):
1019
            warn("BzrBranch.__init__(transport=XXX...): The transport "
1020
                 "parameter is deprecated as of bzr 0.8. "
1021
                 "Please use Branch.open, or bzrdir.open_branch().",
1022
                 DeprecationWarning,
1023
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1024
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1025
1 by mbp at sourcefrog
import from baz patch-364
1026
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1027
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1028
1029
    __repr__ = __str__
1030
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1031
    def _get_base(self):
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
1032
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1033
1442.1.5 by Robert Collins
Give branch.base a docstring.
1034
    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,
1035
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1036
    def _finish_transaction(self):
1037
        """Exit the current transaction."""
1185.65.13 by Robert Collins
Merge from integration
1038
        return self.control_files._finish_transaction()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1039
1040
    def get_transaction(self):
1185.65.13 by Robert Collins
Merge from integration
1041
        """Return the current active transaction.
1042
1043
        If no transaction is active, this returns a passthrough object
1044
        for which all data is immediately flushed and no caching happens.
1045
        """
1046
        # this is an explicit function so that we can do tricky stuff
1047
        # when the storage in rev_storage is elsewhere.
1048
        # we probably need to hook the two 'lock a location' and 
1049
        # 'have a transaction' together more delicately, so that
1050
        # we can have two locks (branch and storage) and one transaction
1051
        # ... and finishing the transaction unlocks both, but unlocking
1052
        # does not. - RBC 20051121
1053
        return self.control_files.get_transaction()
1054
1055
    def _set_transaction(self, transaction):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1056
        """Set a new active transaction."""
1185.65.13 by Robert Collins
Merge from integration
1057
        return self.control_files._set_transaction(transaction)
353 by Martin Pool
- Per-branch locks in read and write modes.
1058
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1059
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1060
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1061
        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.
1062
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.
1063
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
1064
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
1065
1534.4.8 by Robert Collins
Unfuck upgrade.
1066
        The format is stored as a reference to the format object in
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1067
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
1068
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1069
        The format parameter is either None or the branch format class
1070
        used to open this branch.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1071
1072
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
1073
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1074
        if format is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1075
            format = BranchFormat.find_format(self.bzrdir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1076
        self._format = format
1077
        mutter("got branch format %s", self._format)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1078
1508.1.15 by Robert Collins
Merge from mpool.
1079
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1080
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1081
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1082
        tree = self.repository.revision_tree(self.last_revision())
1083
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1084
1694.2.6 by Martin Pool
[merge] bzr.dev
1085
    def is_locked(self):
1086
        return self.control_files.is_locked()
1087
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1088
    def lock_write(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1089
        self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1090
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1091
            self.control_files.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1092
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1093
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1094
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1095
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1096
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1097
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1098
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1099
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1100
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1101
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1102
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1103
1104
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1105
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1106
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1107
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1108
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1109
            self.repository.unlock()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1110
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1111
    def peek_lock_mode(self):
1112
        if self.control_files._lock_count == 0:
1113
            return None
1114
        else:
1115
            return self.control_files._lock_mode
1116
1694.2.6 by Martin Pool
[merge] bzr.dev
1117
    def get_physical_lock_status(self):
1118
        return self.control_files.get_physical_lock_status()
1119
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1120
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1121
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1122
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1123
        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.
1124
1125
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1126
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1127
        """See Branch.append_revision."""
905 by Martin Pool
- merge aaron's append_multiple.patch
1128
        for revision_id in revision_ids:
1129
            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.
1130
        rev_history = self.revision_history()
1131
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1132
        self.set_revision_history(rev_history)
1133
1134
    @needs_write_lock
1135
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1136
        """See Branch.set_revision_history."""
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
1137
        self.control_files.put_utf8(
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1138
            'revision-history', '\n'.join(rev_history))
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1139
        transaction = self.get_transaction()
1140
        history = transaction.map.find_revision_history()
1141
        if history is not None:
1142
            # update the revision history in the identity map.
1143
            history[:] = list(rev_history)
1144
            # this call is disabled because revision_history is 
1145
            # not really an object yet, and the transaction is for objects.
1146
            # transaction.register_dirty(history)
1147
        else:
1148
            transaction.map.add_revision_history(rev_history)
1149
            # this call is disabled because revision_history is 
1150
            # not really an object yet, and the transaction is for objects.
1151
            # transaction.register_clean(history)
233 by mbp at sourcefrog
- more output from test.sh
1152
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1153
    @needs_write_lock
1154
    def set_last_revision(self, revision_id):
1155
        self.set_revision_history(self._lefthand_history(revision_id))
1156
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1157
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
1158
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1159
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1160
        transaction = self.get_transaction()
1161
        history = transaction.map.find_revision_history()
1162
        if history is not None:
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1163
            # mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
1164
            return list(history)
1911.2.4 by John Arbash Meinel
use cached strings for Branch.revision_history
1165
        decode_utf8 = cache_utf8.decode
1166
        history = [decode_utf8(l.rstrip('\r\n')) for l in
1167
                self.control_files.get('revision-history').readlines()]
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1168
        transaction.map.add_revision_history(history)
1169
        # this call is disabled because revision_history is 
1170
        # not really an object yet, and the transaction is for objects.
1171
        # transaction.register_clean(history, precious=True)
1172
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
1173
2230.3.2 by Aaron Bentley
Get all branch tests passing
1174
    def _lefthand_history(self, revision_id, last_rev=None,
1175
                          other_branch=None):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1176
        # stop_revision must be a descendant of last_revision
1177
        stop_graph = self.repository.get_revision_graph(revision_id)
1178
        if last_rev is not None and last_rev not in stop_graph:
1179
            # our previous tip is not merged into stop_revision
1180
            raise errors.DivergedBranches(self, other_branch)
1181
        # make a new revision history from the graph
1182
        current_rev_id = revision_id
1183
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1184
        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.
1185
            new_history.append(current_rev_id)
1186
            current_rev_id_parents = stop_graph[current_rev_id]
1187
            try:
1188
                current_rev_id = current_rev_id_parents[0]
1189
            except IndexError:
1190
                current_rev_id = None
1191
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1192
        return new_history
1193
1194
    @needs_write_lock
1195
    def generate_revision_history(self, revision_id, last_rev=None, 
1196
        other_branch=None):
1197
        """Create a new revision history that will finish with revision_id.
1198
        
1199
        :param revision_id: the new tip to use.
1200
        :param last_rev: The previous last_revision. If not None, then this
1201
            must be a ancestory of revision_id, or DivergedBranches is raised.
1202
        :param other_branch: The other branch that DivergedBranches should
1203
            raise with respect to.
1204
        """
1205
        self.set_revision_history(self._lefthand_history(revision_id,
1206
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1207
1208
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1209
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1210
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1211
        other.lock_read()
1212
        try:
1213
            if stop_revision is None:
1214
                stop_revision = other.last_revision()
1215
                if stop_revision is None:
1216
                    # if there are no commits, we're done.
1217
                    return
1218
            # whats the current last revision, before we fetch [and change it
1219
            # possibly]
1220
            last_rev = self.last_revision()
1221
            # we fetch here regardless of whether we need to so that we pickup
1222
            # filled in ghosts.
1223
            self.fetch(other, stop_revision)
1224
            my_ancestry = self.repository.get_ancestry(last_rev)
1225
            if stop_revision in my_ancestry:
1226
                # last_revision is a descendant of stop_revision
1227
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1228
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1229
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1230
        finally:
1231
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1232
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1233
    def basis_tree(self):
1234
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1235
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1236
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1237
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1238
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1239
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1240
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1241
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1242
        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.
1243
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1244
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1245
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1246
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1247
    @needs_write_lock
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
1248
    def pull(self, source, overwrite=False, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1249
        """See Branch.pull."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1250
        source.lock_read()
1251
        try:
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1252
            old_count = len(self.revision_history())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1253
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1254
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1255
            except DivergedBranches:
1256
                if not overwrite:
1257
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1258
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1259
                self.set_revision_history(source.revision_history())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1260
            new_count = len(self.revision_history())
1261
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1262
        finally:
1263
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1264
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1265
    def _get_parent_location(self):
1266
        _locs = ['parent', 'pull', 'x-pull']
1267
        for l in _locs:
1268
            try:
1269
                return self.control_files.get(l).read().strip('\n')
1270
            except NoSuchFile:
1271
                pass
1272
        return None
1273
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1274
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1275
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1276
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1277
        assert self.base[-1] == '/'
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1278
        parent = self._get_parent_location()
1279
        if parent is None:
1280
            return parent
1281
        # This is an old-format absolute path to a local branch
1282
        # turn it into a url
1283
        if parent.startswith('/'):
1284
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1285
        try:
1286
            return urlutils.join(self.base[:-1], parent)
1287
        except errors.InvalidURLJoin, e:
1288
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1289
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1290
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1291
        """See Branch.get_push_location."""
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1292
        push_loc = self.get_config().get_user_option('push_location')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1293
        return push_loc
1294
1295
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1296
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1297
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1298
            'push_location', location,
1299
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1300
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1301
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1302
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1303
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1304
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1305
        # URLs should never be unicode, even on the local fs,
1306
        # FIXUP this and get_parent in a future branch format bump:
1307
        # read and rewrite the file, and have the new format code read
1308
        # using .get not .get_utf8. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1309
        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
1310
            if isinstance(url, unicode):
1311
                try: 
1312
                    url = url.encode('ascii')
1313
                except UnicodeEncodeError:
1314
                    raise bzrlib.errors.InvalidURL(url,
1315
                        "Urls must be 7-bit ascii, "
1316
                        "use bzrlib.urlutils.escape")
1317
                    
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1318
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1319
        self._set_parent_location(url)
1320
1321
    def _set_parent_location(self, url):
1322
        if url is None:
1323
            self.control_files._transport.delete('parent')
1324
        else:
1325
            assert isinstance(url, str)
1955.3.4 by John Arbash Meinel
Fix 2 calls to 'put()' that were using strings instead of files
1326
            self.control_files.put('parent', StringIO(url + '\n'))
1150 by Martin Pool
- add new Branch.set_parent and tests
1327
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1328
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1329
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1330
        """DEPRECATED; call get_config instead.  
1331
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1332
        return TreeConfig(self)
1333
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1334
1335
class BzrBranch5(BzrBranch):
1336
    """A format 5 branch. This supports new features over plan branches.
1337
1338
    It has support for a master_branch which is the data for bound branches.
1339
    """
1340
1341
    def __init__(self,
1342
                 _format,
1343
                 _control_files,
1344
                 a_bzrdir,
1345
                 _repository):
1346
        super(BzrBranch5, self).__init__(_format=_format,
1347
                                         _control_files=_control_files,
1348
                                         a_bzrdir=a_bzrdir,
1349
                                         _repository=_repository)
1350
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1351
    @needs_write_lock
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1352
    def pull(self, source, overwrite=False, stop_revision=None):
1353
        """Updates branch.pull to be bound branch aware."""
1354
        bound_location = self.get_bound_location()
1355
        if source.base != bound_location:
1356
            # not pulling from master, so we need to update master.
1357
            master_branch = self.get_master_branch()
1358
            if master_branch:
1359
                master_branch.pull(source)
1360
                source = master_branch
1361
        return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1362
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1363
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1364
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1365
            return self.control_files.get_utf8('bound').read()[:-1]
1366
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1367
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1368
1369
    @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.
1370
    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
1371
        """Return the branch we are bound to.
1372
        
1373
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1374
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1375
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1376
        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.
1377
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1378
        # 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
1379
        """
1380
        bound_loc = self.get_bound_location()
1381
        if not bound_loc:
1382
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1383
        try:
1384
            return Branch.open(bound_loc)
1385
        except (errors.NotBranchError, errors.ConnectionError), e:
1386
            raise errors.BoundBranchConnectionFailure(
1387
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1388
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1389
    @needs_write_lock
1390
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1391
        """Set the target where this branch is bound to.
1392
1393
        :param location: URL to the target branch
1394
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1395
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1396
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1397
        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.
1398
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1399
                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.
1400
            except NoSuchFile:
1401
                return False
1402
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1403
1404
    @needs_write_lock
1405
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1406
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1407
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1408
        This does not push or pull data between the branches, though it does
1409
        check for divergence to raise an error when the branches are not
1410
        either the same, or one a prefix of the other. That behaviour may not
1411
        be useful, so that check may be removed in future.
1412
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1413
        :param other: The branch to bind to
1414
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1415
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1416
        # TODO: jam 20051230 Consider checking if the target is bound
1417
        #       It is debatable whether you should be able to bind to
1418
        #       a branch which is itself bound.
1419
        #       Committing is obviously forbidden,
1420
        #       but binding itself may not be.
1421
        #       Since we *have* to check at commit time, we don't
1422
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1423
1424
        # we want to raise diverged if:
1425
        # last_rev is not in the other_last_rev history, AND
1426
        # other_last_rev is not in our history, and do it without pulling
1427
        # history around
1428
        last_rev = self.last_revision()
1429
        if last_rev is not None:
1430
            other.lock_read()
1431
            try:
1432
                other_last_rev = other.last_revision()
1433
                if other_last_rev is not None:
1434
                    # neither branch is new, we have to do some work to
1435
                    # ascertain diversion.
1436
                    remote_graph = other.repository.get_revision_graph(
1437
                        other_last_rev)
1438
                    local_graph = self.repository.get_revision_graph(last_rev)
1439
                    if (last_rev not in remote_graph and
1440
                        other_last_rev not in local_graph):
1441
                        raise errors.DivergedBranches(self, other)
1442
            finally:
1443
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1444
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1445
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1446
    @needs_write_lock
1447
    def unbind(self):
1448
        """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.
1449
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1450
1587.1.10 by Robert Collins
update updates working tree and branch together.
1451
    @needs_write_lock
1452
    def update(self):
1453
        """Synchronise this branch with the master branch if any. 
1454
1455
        :return: None or the last_revision that was pivoted out during the
1456
                 update.
1457
        """
1458
        master = self.get_master_branch()
1459
        if master is not None:
1460
            old_tip = self.last_revision()
1461
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1462
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1463
                return None
1464
            return old_tip
1465
        return None
1466
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1467
2230.3.1 by Aaron Bentley
Get branch6 creation working
1468
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1469
1470
    @needs_read_lock
1471
    def last_revision(self):
1472
        """Return last revision id, or None"""
1473
        revision_id = self.control_files.get_utf8('last-revision').read()
1474
        revision_id = revision_id.rstrip('\n')
1475
        if revision_id == _mod_revision.NULL_REVISION:
1476
            revision_id = None
1477
        return revision_id
1478
1479
    @needs_write_lock
1480
    def set_last_revision(self, revision_id):
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1481
        if revision_id is None:
1482
            revision_id = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
1483
        self.control_files.put_utf8('last-revision', revision_id + '\n')
1484
1485
    @needs_read_lock
1486
    def revision_history(self):
1487
        """Generate the revision history from last revision
1488
        """
1489
        return self._lefthand_history(self.last_revision())
1490
1491
    @needs_write_lock
1492
    def set_revision_history(self, history):
1493
        """Set the last_revision, not revision history"""
1494
        if len(history) == 0:
1495
            self.set_last_revision('null:')
1496
        else:
1497
            assert history == self._lefthand_history(history[-1])
1498
            self.set_last_revision(history[-1])
2230.3.1 by Aaron Bentley
Get branch6 creation working
1499
2230.3.3 by Aaron Bentley
Add more config testing
1500
    @needs_write_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1501
    def _set_parent_location(self, url):
2230.3.3 by Aaron Bentley
Add more config testing
1502
        """Set the parent branch"""
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1503
        if url is None:
1504
            url = ''
2230.3.3 by Aaron Bentley
Add more config testing
1505
        url = urlutils.relative_url(self.base, url)
1506
        self.get_config().set_user_option('parent_location', url)
1507
1508
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1509
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
1510
        """Set the parent branch"""
2230.3.4 by Aaron Bentley
Follow get_parent API more closely
1511
        parent = self.get_config().get_user_option('parent_location')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1512
        if parent == '':
1513
            parent = None
1514
        return parent
2230.3.3 by Aaron Bentley
Add more config testing
1515
1516
    def set_push_location(self, location):
1517
        """See Branch.set_push_location."""
1518
        self.get_config().set_user_option('push_location', location)
1519
1520
    def set_bound_location(self, location):
1521
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
1522
        result = None
2230.3.6 by Aaron Bentley
work in progress bind stuff
1523
        if location is None:
2230.3.7 by Aaron Bentley
Fix binding return values
1524
            if self.get_bound_location() is None:
1525
                return False
2230.3.6 by Aaron Bentley
work in progress bind stuff
1526
            location = ''
2230.3.7 by Aaron Bentley
Fix binding return values
1527
            result = True
2230.3.3 by Aaron Bentley
Add more config testing
1528
        self.get_config().set_user_option('bound_location', location)
2230.3.7 by Aaron Bentley
Fix binding return values
1529
        return result
2230.3.3 by Aaron Bentley
Add more config testing
1530
1531
    def get_bound_location(self):
1532
        """See Branch.set_push_location."""
2230.3.6 by Aaron Bentley
work in progress bind stuff
1533
        location = self.get_config().get_user_option('bound_location')
1534
        if location == '':
1535
            location = None
1536
        return location
2230.3.3 by Aaron Bentley
Add more config testing
1537
2230.3.1 by Aaron Bentley
Get branch6 creation working
1538
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1539
class BranchTestProviderAdapter(object):
1540
    """A tool to generate a suite testing multiple branch formats at once.
1541
1542
    This is done by copying the test once for each transport and injecting
1543
    the transport_server, transport_readonly_server, and branch_format
1544
    classes into each copy. Each copy is also given a new id() to make it
1545
    easy to identify.
1546
    """
1547
1548
    def __init__(self, transport_server, transport_readonly_server, formats):
1549
        self._transport_server = transport_server
1550
        self._transport_readonly_server = transport_readonly_server
1551
        self._formats = formats
1552
    
1553
    def adapt(self, test):
1554
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1555
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1556
            new_test = deepcopy(test)
1557
            new_test.transport_server = self._transport_server
1558
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1559
            new_test.bzrdir_format = bzrdir_format
1560
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1561
            def make_new_test_id():
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1562
                new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1563
                return lambda: new_id
1564
            new_test.id = make_new_test_id()
1565
            result.addTest(new_test)
1566
        return result
1567
1568
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1569
class BranchCheckResult(object):
1570
    """Results of checking branch consistency.
1571
1572
    :see: Branch.check
1573
    """
1574
1575
    def __init__(self, branch):
1576
        self.branch = branch
1577
1578
    def report_results(self, verbose):
1579
        """Report the check results via trace.note.
1580
        
1581
        :param verbose: Requests more detailed display of what was checked,
1582
            if any.
1583
        """
1584
        note('checked branch %s format %s',
1585
             self.branch.base,
1586
             self.branch._format)
1587
1588
1 by mbp at sourcefrog
import from baz patch-364
1589
######################################################################
1590
# predicates
1591
1592
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1593
@deprecated_function(zero_eight)
1594
def is_control_file(*args, **kwargs):
1595
    """See bzrlib.workingtree.is_control_file."""
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1596
    from bzrlib import workingtree
1597
    return workingtree.is_control_file(*args, **kwargs)