/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
        """
544
        new_history = self.revision_history()
545
        if revision_id is not None:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
546
            try:
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.
547
                new_history = new_history[:new_history.index(revision_id) + 1]
548
            except ValueError:
549
                rev = self.repository.get_revision(revision_id)
550
                new_history = rev.get_history(self.repository)[1:]
551
        destination.set_revision_history(new_history)
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
552
        try:
553
            parent = self.get_parent()
554
        except errors.InaccessibleParent, e:
555
            mutter('parent was not accessible to copy: %s', e)
556
        else:
557
            if parent:
558
                destination.set_parent(parent)
1185.66.1 by Aaron Bentley
Merged from mainline
559
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
560
    @needs_read_lock
561
    def check(self):
562
        """Check consistency of the branch.
563
564
        In particular this checks that revisions given in the revision-history
565
        do actually match up in the revision graph, and that they're all 
566
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
567
        
568
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
569
570
        :return: A BranchCheckResult.
571
        """
572
        mainline_parent_id = None
573
        for revision_id in self.revision_history():
574
            try:
575
                revision = self.repository.get_revision(revision_id)
576
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
577
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
578
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
579
            # In general the first entry on the revision history has no parents.
580
            # But it's not illegal for it to have parents listed; this can happen
581
            # in imports from Arch when the parents weren't reachable.
582
            if mainline_parent_id is not None:
583
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
584
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
585
                                        "parents of {%s}"
586
                                        % (mainline_parent_id, revision_id))
587
            mainline_parent_id = revision_id
588
        return BranchCheckResult(self)
589
1910.2.39 by Aaron Bentley
Fix checkout bug
590
    def _get_checkout_format(self):
591
        """Return the most suitable metadir for a checkout of this branch.
592
        Weaves are used if this branch's repostory uses weaves.
593
        """
594
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
595
            from bzrlib import repository
596
            format = bzrdir.BzrDirMetaFormat1()
597
            format.repository_format = repository.RepositoryFormat7()
598
        else:
1910.2.41 by Aaron Bentley
Clean up clone format creation
599
            format = self.repository.bzrdir.cloning_metadir()
1910.2.39 by Aaron Bentley
Fix checkout bug
600
        return format
601
1551.8.5 by Aaron Bentley
Change name to create_checkout
602
    def create_checkout(self, to_location, revision_id=None, 
603
                        lightweight=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
604
        """Create a checkout of a branch.
605
        
606
        :param to_location: The url to produce the checkout at
607
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
608
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
609
        produce a bound branch (heavyweight checkout)
610
        :return: The tree of the created checkout
611
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
612
        t = transport.get_transport(to_location)
613
        try:
614
            t.mkdir('.')
615
        except errors.FileExists:
616
            pass
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
617
        if lightweight:
618
            checkout = bzrdir.BzrDirMetaFormat1().initialize_on_transport(t)
619
            BranchReferenceFormat().initialize(checkout, self)
620
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
621
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
622
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
623
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
624
            checkout = checkout_branch.bzrdir
625
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
626
            # pull up to the specified revision_id to set the initial 
627
            # branch tip correctly, and seed it with history.
628
            checkout_branch.pull(self, stop_revision=revision_id)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
629
        return checkout.create_workingtree(revision_id)
630
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
631
632
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
633
    """An encapsulation of the initialization and open routines for a format.
634
635
    Formats provide three things:
636
     * An initialization routine,
637
     * a format string,
638
     * an open routine.
639
640
    Formats are placed in an dict by their format string for reference 
641
    during branch opening. Its not required that these be instances, they
642
    can be classes themselves with class methods - it simply depends on 
643
    whether state is needed for a given format or not.
644
645
    Once a format is deprecated, just deprecate the initialize and open
646
    methods on the format class. Do not deprecate the object, as the 
647
    object will be created every time regardless.
648
    """
649
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
650
    _default_format = None
651
    """The default format used for new branches."""
652
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
653
    _formats = {}
654
    """The known formats."""
655
656
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
657
    def find_format(klass, a_bzrdir):
658
        """Return the format for the branch object in a_bzrdir."""
659
        try:
660
            transport = a_bzrdir.get_branch_transport(None)
661
            format_string = transport.get("format").read()
662
            return klass._formats[format_string]
663
        except NoSuchFile:
664
            raise NotBranchError(path=transport.base)
665
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
666
            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.
667
668
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
669
    def get_default_format(klass):
670
        """Return the current default format."""
671
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
672
673
    def get_format_string(self):
674
        """Return the ASCII format string that identifies this format."""
675
        raise NotImplementedError(self.get_format_string)
676
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
677
    def get_format_description(self):
678
        """Return the short format description for this format."""
679
        raise NotImplementedError(self.get_format_string)
680
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
681
    def initialize(self, a_bzrdir):
682
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
683
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
684
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.
685
    def is_supported(self):
686
        """Is this format supported?
687
688
        Supported formats can be initialized and opened.
689
        Unsupported formats may not support initialization or committing or 
690
        some other features depending on the reason for not being supported.
691
        """
692
        return True
693
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
694
    def open(self, a_bzrdir, _found=False):
695
        """Return the branch object for a_bzrdir
696
697
        _found is a private parameter, do not use it. It is used to indicate
698
               if format probing has already be done.
699
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
700
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
701
702
    @classmethod
703
    def register_format(klass, format):
704
        klass._formats[format.get_format_string()] = format
705
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
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
707
    def set_default_format(klass, format):
708
        klass._default_format = format
709
710
    @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.
711
    def unregister_format(klass, format):
712
        assert klass._formats[format.get_format_string()] is format
713
        del klass._formats[format.get_format_string()]
714
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
715
    def __str__(self):
716
        return self.get_format_string().rstrip()
717
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
718
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
719
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
720
    """Bzr branch format 4.
721
722
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
723
     - 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.
724
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
725
    """
726
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
727
    def get_format_description(self):
728
        """See BranchFormat.get_format_description()."""
729
        return "Branch format 4"
730
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
731
    def initialize(self, a_bzrdir):
732
        """Create a branch of this format in a_bzrdir."""
733
        mutter('creating branch in %s', a_bzrdir.transport.base)
734
        branch_transport = a_bzrdir.get_branch_transport(self)
735
        utf8_files = [('revision-history', ''),
736
                      ('branch-name', ''),
737
                      ]
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
738
        control_files = lockable_files.LockableFiles(branch_transport,
739
                             'branch-lock', lockable_files.TransportLock)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
740
        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.
741
        control_files.lock_write()
742
        try:
743
            for file, content in utf8_files:
744
                control_files.put_utf8(file, content)
745
        finally:
746
            control_files.unlock()
747
        return self.open(a_bzrdir, _found=True)
748
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
749
    def __init__(self):
750
        super(BzrBranchFormat4, self).__init__()
751
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
752
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
753
    def open(self, a_bzrdir, _found=False):
754
        """Return the branch object for a_bzrdir
755
756
        _found is a private parameter, do not use it. It is used to indicate
757
               if format probing has already be done.
758
        """
759
        if not _found:
760
            # we are being called directly and must probe.
761
            raise NotImplementedError
762
        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.
763
                         _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.
764
                         a_bzrdir=a_bzrdir,
765
                         _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.
766
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
767
    def __str__(self):
768
        return "Bazaar-NG branch format 4"
769
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
770
771
class BzrBranchFormat5(BranchFormat):
772
    """Bzr branch format 5.
773
774
    This format has:
775
     - a revision-history file.
776
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
777
     - a lock dir guarding the branch itself
778
     - 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.
779
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
780
781
    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.
782
    """
783
784
    def get_format_string(self):
785
        """See BranchFormat.get_format_string()."""
786
        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
787
788
    def get_format_description(self):
789
        """See BranchFormat.get_format_description()."""
790
        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.
791
        
792
    def initialize(self, a_bzrdir):
793
        """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
794
        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.
795
        branch_transport = a_bzrdir.get_branch_transport(self)
796
        utf8_files = [('revision-history', ''),
797
                      ('branch-name', ''),
798
                      ]
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
799
        control_files = lockable_files.LockableFiles(branch_transport, 'lock',
800
                                                     lockdir.LockDir)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
801
        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.
802
        control_files.lock_write()
803
        control_files.put_utf8('format', self.get_format_string())
804
        try:
805
            for file, content in utf8_files:
806
                control_files.put_utf8(file, content)
807
        finally:
808
            control_files.unlock()
809
        return self.open(a_bzrdir, _found=True, )
810
811
    def __init__(self):
812
        super(BzrBranchFormat5, self).__init__()
813
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
814
815
    def open(self, a_bzrdir, _found=False):
816
        """Return the branch object for a_bzrdir
817
818
        _found is a private parameter, do not use it. It is used to indicate
819
               if format probing has already be done.
820
        """
821
        if not _found:
822
            format = BranchFormat.find_format(a_bzrdir)
823
            assert format.__class__ == self.__class__
824
        transport = a_bzrdir.get_branch_transport(None)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
825
        control_files = lockable_files.LockableFiles(transport, 'lock',
826
                                                     lockdir.LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
827
        return BzrBranch5(_format=self,
828
                          _control_files=control_files,
829
                          a_bzrdir=a_bzrdir,
830
                          _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.
831
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
832
    def __str__(self):
833
        return "Bazaar-NG Metadir branch format 5"
834
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
835
2230.3.1 by Aaron Bentley
Get branch6 creation working
836
class BzrBranchFormat6(BzrBranchFormat5):
837
    """Branch format with last-revision
838
    
839
    Unlike previous formats, this has no explicit revision history, instead
840
    the left-parent revision history is used.
841
    """
842
843
    def get_format_string(self):
844
        """See BranchFormat.get_format_string()."""
845
        return "Bazaar-NG branch format 6\n"
846
847
    def get_format_description(self):
848
        """See BranchFormat.get_format_description()."""
849
        return "Branch format 6"
850
851
    def initialize(self, a_bzrdir):
852
        """Create a branch of this format in a_bzrdir."""
853
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
854
        branch_transport = a_bzrdir.get_branch_transport(self)
2230.3.2 by Aaron Bentley
Get all branch tests passing
855
        utf8_files = [('last-revision', 'null:\n'),
2230.3.1 by Aaron Bentley
Get branch6 creation working
856
                      ('branch-name', ''),
857
                      ('branch.conf', '')
858
                      ]
859
        control_files = lockable_files.LockableFiles(branch_transport, 'lock',
860
                                                     lockdir.LockDir)
861
        control_files.create_lock()
862
        control_files.lock_write()
863
        control_files.put_utf8('format', self.get_format_string())
864
        try:
865
            for file, content in utf8_files:
866
                control_files.put_utf8(file, content)
867
        finally:
868
            control_files.unlock()
869
        return self.open(a_bzrdir, _found=True, )
870
871
    def open(self, a_bzrdir, _found=False):
872
        """Return the branch object for a_bzrdir
873
874
        _found is a private parameter, do not use it. It is used to indicate
875
               if format probing has already be done.
876
        """
877
        if not _found:
878
            format = BranchFormat.find_format(a_bzrdir)
879
            assert format.__class__ == self.__class__
880
        transport = a_bzrdir.get_branch_transport(None)
881
        control_files = lockable_files.LockableFiles(transport, 'lock',
882
                                                     lockdir.LockDir)
883
        return BzrBranch6(_format=self,
884
                          _control_files=control_files,
885
                          a_bzrdir=a_bzrdir,
886
                          _repository=a_bzrdir.find_repository())
887
888
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.
889
class BranchReferenceFormat(BranchFormat):
890
    """Bzr branch reference format.
891
892
    Branch references are used in implementing checkouts, they
893
    act as an alias to the real branch which is at some other url.
894
895
    This format has:
896
     - A location file
897
     - a format string
898
    """
899
900
    def get_format_string(self):
901
        """See BranchFormat.get_format_string()."""
902
        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
903
904
    def get_format_description(self):
905
        """See BranchFormat.get_format_description()."""
906
        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.
907
        
908
    def initialize(self, a_bzrdir, target_branch=None):
909
        """Create a branch of this format in a_bzrdir."""
910
        if target_branch is None:
911
            # this format does not implement branch itself, thus the implicit
912
            # creation contract must see it as uninitializable
913
            raise errors.UninitializableFormat(self)
914
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
915
        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
916
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
917
            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
918
        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.
919
        return self.open(a_bzrdir, _found=True)
920
921
    def __init__(self):
922
        super(BranchReferenceFormat, self).__init__()
923
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
924
925
    def _make_reference_clone_function(format, a_branch):
926
        """Create a clone() routine for a branch dynamically."""
927
        def clone(to_bzrdir, revision_id=None):
928
            """See Branch.clone()."""
929
            return format.initialize(to_bzrdir, a_branch)
930
            # cannot obey revision_id limits when cloning a reference ...
931
            # FIXME RBC 20060210 either nuke revision_id for clone, or
932
            # emit some sort of warning/error to the caller ?!
933
        return clone
934
935
    def open(self, a_bzrdir, _found=False):
936
        """Return the branch that the branch reference in a_bzrdir points at.
937
938
        _found is a private parameter, do not use it. It is used to indicate
939
               if format probing has already be done.
940
        """
941
        if not _found:
942
            format = BranchFormat.find_format(a_bzrdir)
943
            assert format.__class__ == self.__class__
944
        transport = a_bzrdir.get_branch_transport(None)
945
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
946
        result = real_bzrdir.open_branch()
947
        # this changes the behaviour of result.clone to create a new reference
948
        # rather than a copy of the content of the branch.
949
        # I did not use a proxy object because that needs much more extensive
950
        # testing, and we are only changing one behaviour at the moment.
951
        # If we decide to alter more behaviours - i.e. the implicit nickname
952
        # then this should be refactored to introduce a tested proxy branch
953
        # and a subclass of that for use in overriding clone() and ....
954
        # - RBC 20060210
955
        result.clone = self._make_reference_clone_function(result)
956
        return result
957
958
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
959
# formats which have no format string are not discoverable
960
# 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.
961
__default_format = BzrBranchFormat5()
962
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.
963
BranchFormat.register_format(BranchReferenceFormat())
2230.3.1 by Aaron Bentley
Get branch6 creation working
964
BranchFormat.register_format(BzrBranchFormat6())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
965
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
966
_legacy_formats = [BzrBranchFormat4(),
967
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
968
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
969
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
970
    """A branch stored in the actual filesystem.
971
972
    Note that it's "local" in the context of the filesystem; it doesn't
973
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
974
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
975
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
976
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
977
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
978
                 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.
979
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
980
        """Create new branch object at a particular location.
981
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
982
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
983
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
984
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
985
             unversioned directory.  If False, the branch must already
986
             be versioned.
987
1293 by Martin Pool
- add Branch constructor option to relax version check
988
        relax_version_check -- If true, the usual check for the branch
989
            version is not applied.  This is intended only for
990
            upgrade/recovery type use; it's not guaranteed that
991
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
992
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
993
        if a_bzrdir is None:
994
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
995
        else:
996
            self.bzrdir = a_bzrdir
997
        self._transport = self.bzrdir.transport.clone('..')
1534.4.28 by Robert Collins
first cut at merge from integration.
998
        self._base = self._transport.base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
999
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1000
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1001
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1002
        self.control_files = _control_files
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1003
        if deprecated_passed(init):
1004
            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.
1005
                 "deprecated as of bzr 0.8. Please use Branch.create().",
1006
                 DeprecationWarning,
1007
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1008
            if init:
1009
                # this is slower than before deprecation, oh well never mind.
1010
                # -> its deprecated.
1011
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
1012
        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.
1013
        if deprecated_passed(relax_version_check):
1014
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1015
                 "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.
1016
                 "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.
1017
                 "open() method.",
1018
                 DeprecationWarning,
1019
                 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.
1020
            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.
1021
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
1022
                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.
1023
        if deprecated_passed(transport):
1024
            warn("BzrBranch.__init__(transport=XXX...): The transport "
1025
                 "parameter is deprecated as of bzr 0.8. "
1026
                 "Please use Branch.open, or bzrdir.open_branch().",
1027
                 DeprecationWarning,
1028
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1029
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1030
1 by mbp at sourcefrog
import from baz patch-364
1031
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1032
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1033
1034
    __repr__ = __str__
1035
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1036
    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
1037
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1038
1442.1.5 by Robert Collins
Give branch.base a docstring.
1039
    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,
1040
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1041
    def _finish_transaction(self):
1042
        """Exit the current transaction."""
1185.65.13 by Robert Collins
Merge from integration
1043
        return self.control_files._finish_transaction()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1044
1045
    def get_transaction(self):
1185.65.13 by Robert Collins
Merge from integration
1046
        """Return the current active transaction.
1047
1048
        If no transaction is active, this returns a passthrough object
1049
        for which all data is immediately flushed and no caching happens.
1050
        """
1051
        # this is an explicit function so that we can do tricky stuff
1052
        # when the storage in rev_storage is elsewhere.
1053
        # we probably need to hook the two 'lock a location' and 
1054
        # 'have a transaction' together more delicately, so that
1055
        # we can have two locks (branch and storage) and one transaction
1056
        # ... and finishing the transaction unlocks both, but unlocking
1057
        # does not. - RBC 20051121
1058
        return self.control_files.get_transaction()
1059
1060
    def _set_transaction(self, transaction):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1061
        """Set a new active transaction."""
1185.65.13 by Robert Collins
Merge from integration
1062
        return self.control_files._set_transaction(transaction)
353 by Martin Pool
- Per-branch locks in read and write modes.
1063
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1064
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1065
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1066
        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.
1067
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.
1068
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
1069
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
1070
1534.4.8 by Robert Collins
Unfuck upgrade.
1071
        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.
1072
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
1073
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1074
        The format parameter is either None or the branch format class
1075
        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.
1076
1077
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
1078
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1079
        if format is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1080
            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.
1081
        self._format = format
1082
        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.
1083
1508.1.15 by Robert Collins
Merge from mpool.
1084
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1085
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1086
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1087
        tree = self.repository.revision_tree(self.last_revision())
1088
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1089
1694.2.6 by Martin Pool
[merge] bzr.dev
1090
    def is_locked(self):
1091
        return self.control_files.is_locked()
1092
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1093
    def lock_write(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1094
        self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1095
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1096
            self.control_files.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1097
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1098
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1099
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1100
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1101
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1102
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1103
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1104
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1105
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1106
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1107
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1108
1109
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1110
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1111
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1112
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1113
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1114
            self.repository.unlock()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1115
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1116
    def peek_lock_mode(self):
1117
        if self.control_files._lock_count == 0:
1118
            return None
1119
        else:
1120
            return self.control_files._lock_mode
1121
1694.2.6 by Martin Pool
[merge] bzr.dev
1122
    def get_physical_lock_status(self):
1123
        return self.control_files.get_physical_lock_status()
1124
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1125
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1126
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1127
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1128
        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.
1129
1130
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1131
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1132
        """See Branch.append_revision."""
905 by Martin Pool
- merge aaron's append_multiple.patch
1133
        for revision_id in revision_ids:
1134
            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.
1135
        rev_history = self.revision_history()
1136
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1137
        self.set_revision_history(rev_history)
1138
1139
    @needs_write_lock
1140
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1141
        """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.
1142
        self.control_files.put_utf8(
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1143
            '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
1144
        transaction = self.get_transaction()
1145
        history = transaction.map.find_revision_history()
1146
        if history is not None:
1147
            # update the revision history in the identity map.
1148
            history[:] = list(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_dirty(history)
1152
        else:
1153
            transaction.map.add_revision_history(rev_history)
1154
            # this call is disabled because revision_history is 
1155
            # not really an object yet, and the transaction is for objects.
1156
            # transaction.register_clean(history)
233 by mbp at sourcefrog
- more output from test.sh
1157
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1158
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
1159
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1160
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1161
        transaction = self.get_transaction()
1162
        history = transaction.map.find_revision_history()
1163
        if history is not None:
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1164
            # mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
1165
            return list(history)
1911.2.4 by John Arbash Meinel
use cached strings for Branch.revision_history
1166
        decode_utf8 = cache_utf8.decode
1167
        history = [decode_utf8(l.rstrip('\r\n')) for l in
1168
                self.control_files.get('revision-history').readlines()]
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1169
        transaction.map.add_revision_history(history)
1170
        # this call is disabled because revision_history is 
1171
        # not really an object yet, and the transaction is for objects.
1172
        # transaction.register_clean(history, precious=True)
1173
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
1174
2230.3.2 by Aaron Bentley
Get all branch tests passing
1175
    def _lefthand_history(self, revision_id, last_rev=None,
1176
                          other_branch=None):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1177
        # stop_revision must be a descendant of last_revision
1178
        stop_graph = self.repository.get_revision_graph(revision_id)
1179
        if last_rev is not None and last_rev not in stop_graph:
1180
            # our previous tip is not merged into stop_revision
1181
            raise errors.DivergedBranches(self, other_branch)
1182
        # make a new revision history from the graph
1183
        current_rev_id = revision_id
1184
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1185
        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.
1186
            new_history.append(current_rev_id)
1187
            current_rev_id_parents = stop_graph[current_rev_id]
1188
            try:
1189
                current_rev_id = current_rev_id_parents[0]
1190
            except IndexError:
1191
                current_rev_id = None
1192
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1193
        return new_history
1194
1195
    @needs_write_lock
1196
    def generate_revision_history(self, revision_id, last_rev=None, 
1197
        other_branch=None):
1198
        """Create a new revision history that will finish with revision_id.
1199
        
1200
        :param revision_id: the new tip to use.
1201
        :param last_rev: The previous last_revision. If not None, then this
1202
            must be a ancestory of revision_id, or DivergedBranches is raised.
1203
        :param other_branch: The other branch that DivergedBranches should
1204
            raise with respect to.
1205
        """
1206
        self.set_revision_history(self._lefthand_history(revision_id,
1207
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1208
1209
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1210
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1211
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1212
        other.lock_read()
1213
        try:
1214
            if stop_revision is None:
1215
                stop_revision = other.last_revision()
1216
                if stop_revision is None:
1217
                    # if there are no commits, we're done.
1218
                    return
1219
            # whats the current last revision, before we fetch [and change it
1220
            # possibly]
1221
            last_rev = self.last_revision()
1222
            # we fetch here regardless of whether we need to so that we pickup
1223
            # filled in ghosts.
1224
            self.fetch(other, stop_revision)
1225
            my_ancestry = self.repository.get_ancestry(last_rev)
1226
            if stop_revision in my_ancestry:
1227
                # last_revision is a descendant of stop_revision
1228
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1229
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1230
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1231
        finally:
1232
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1233
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1234
    def basis_tree(self):
1235
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1236
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1237
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1238
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1239
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1240
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1241
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1242
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1243
        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.
1244
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1245
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1246
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1247
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1248
    @needs_write_lock
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
1249
    def pull(self, source, overwrite=False, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1250
        """See Branch.pull."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1251
        source.lock_read()
1252
        try:
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1253
            old_count = len(self.revision_history())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1254
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1255
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1256
            except DivergedBranches:
1257
                if not overwrite:
1258
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1259
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1260
                self.set_revision_history(source.revision_history())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1261
            new_count = len(self.revision_history())
1262
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1263
        finally:
1264
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1265
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1266
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1267
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1268
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1269
        _locs = ['parent', 'pull', 'x-pull']
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1270
        assert self.base[-1] == '/'
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1271
        for l in _locs:
1272
            try:
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1273
                parent = self.control_files.get(l).read().strip('\n')
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
1274
            except NoSuchFile:
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1275
                continue
1276
            # This is an old-format absolute path to a local branch
1277
            # turn it into a url
1278
            if parent.startswith('/'):
1711.2.48 by John Arbash Meinel
fix a typo in bzrlib/branch
1279
                parent = urlutils.local_path_to_url(parent.decode('utf8'))
1864.7.1 by John Arbash Meinel
Let Branch.get_parent() return None if parent is not accessible, (bug #52976)
1280
            try:
1281
                return urlutils.join(self.base[:-1], parent)
1282
            except errors.InvalidURLJoin, e:
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
1283
                raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1284
        return None
1285
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1286
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1287
        """See Branch.get_push_location."""
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1288
        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.
1289
        return push_loc
1290
1291
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1292
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1293
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1294
            'push_location', location,
1295
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1296
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1297
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1298
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1299
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1300
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1301
        # URLs should never be unicode, even on the local fs,
1302
        # FIXUP this and get_parent in a future branch format bump:
1303
        # read and rewrite the file, and have the new format code read
1304
        # using .get not .get_utf8. RBC 20060125
1614.2.5 by Olaf Conradi
Added testcase for bzr merge --remember.
1305
        if url is None:
1306
            self.control_files._transport.delete('parent')
1307
        else:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1308
            if isinstance(url, unicode):
1309
                try: 
1310
                    url = url.encode('ascii')
1311
                except UnicodeEncodeError:
1312
                    raise bzrlib.errors.InvalidURL(url,
1313
                        "Urls must be 7-bit ascii, "
1314
                        "use bzrlib.urlutils.escape")
1315
                    
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1316
            url = urlutils.relative_url(self.base, url)
1955.3.4 by John Arbash Meinel
Fix 2 calls to 'put()' that were using strings instead of files
1317
            self.control_files.put('parent', StringIO(url + '\n'))
1150 by Martin Pool
- add new Branch.set_parent and tests
1318
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1319
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1320
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1321
        """DEPRECATED; call get_config instead.  
1322
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1323
        return TreeConfig(self)
1324
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1325
1326
class BzrBranch5(BzrBranch):
1327
    """A format 5 branch. This supports new features over plan branches.
1328
1329
    It has support for a master_branch which is the data for bound branches.
1330
    """
1331
1332
    def __init__(self,
1333
                 _format,
1334
                 _control_files,
1335
                 a_bzrdir,
1336
                 _repository):
1337
        super(BzrBranch5, self).__init__(_format=_format,
1338
                                         _control_files=_control_files,
1339
                                         a_bzrdir=a_bzrdir,
1340
                                         _repository=_repository)
1341
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1342
    @needs_write_lock
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1343
    def pull(self, source, overwrite=False, stop_revision=None):
1344
        """Updates branch.pull to be bound branch aware."""
1345
        bound_location = self.get_bound_location()
1346
        if source.base != bound_location:
1347
            # not pulling from master, so we need to update master.
1348
            master_branch = self.get_master_branch()
1349
            if master_branch:
1350
                master_branch.pull(source)
1351
                source = master_branch
1352
        return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1353
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1354
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1355
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1356
            return self.control_files.get_utf8('bound').read()[:-1]
1357
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1358
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1359
1360
    @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.
1361
    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
1362
        """Return the branch we are bound to.
1363
        
1364
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1365
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1366
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1367
        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.
1368
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1369
        # 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
1370
        """
1371
        bound_loc = self.get_bound_location()
1372
        if not bound_loc:
1373
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1374
        try:
1375
            return Branch.open(bound_loc)
1376
        except (errors.NotBranchError, errors.ConnectionError), e:
1377
            raise errors.BoundBranchConnectionFailure(
1378
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1379
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1380
    @needs_write_lock
1381
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1382
        """Set the target where this branch is bound to.
1383
1384
        :param location: URL to the target branch
1385
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1386
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1387
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1388
        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.
1389
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1390
                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.
1391
            except NoSuchFile:
1392
                return False
1393
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1394
1395
    @needs_write_lock
1396
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1397
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1398
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1399
        This does not push or pull data between the branches, though it does
1400
        check for divergence to raise an error when the branches are not
1401
        either the same, or one a prefix of the other. That behaviour may not
1402
        be useful, so that check may be removed in future.
1403
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1404
        :param other: The branch to bind to
1405
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1406
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1407
        # TODO: jam 20051230 Consider checking if the target is bound
1408
        #       It is debatable whether you should be able to bind to
1409
        #       a branch which is itself bound.
1410
        #       Committing is obviously forbidden,
1411
        #       but binding itself may not be.
1412
        #       Since we *have* to check at commit time, we don't
1413
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1414
1415
        # we want to raise diverged if:
1416
        # last_rev is not in the other_last_rev history, AND
1417
        # other_last_rev is not in our history, and do it without pulling
1418
        # history around
1419
        last_rev = self.last_revision()
1420
        if last_rev is not None:
1421
            other.lock_read()
1422
            try:
1423
                other_last_rev = other.last_revision()
1424
                if other_last_rev is not None:
1425
                    # neither branch is new, we have to do some work to
1426
                    # ascertain diversion.
1427
                    remote_graph = other.repository.get_revision_graph(
1428
                        other_last_rev)
1429
                    local_graph = self.repository.get_revision_graph(last_rev)
1430
                    if (last_rev not in remote_graph and
1431
                        other_last_rev not in local_graph):
1432
                        raise errors.DivergedBranches(self, other)
1433
            finally:
1434
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1435
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1436
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1437
    @needs_write_lock
1438
    def unbind(self):
1439
        """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.
1440
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1441
1587.1.10 by Robert Collins
update updates working tree and branch together.
1442
    @needs_write_lock
1443
    def update(self):
1444
        """Synchronise this branch with the master branch if any. 
1445
1446
        :return: None or the last_revision that was pivoted out during the
1447
                 update.
1448
        """
1449
        master = self.get_master_branch()
1450
        if master is not None:
1451
            old_tip = self.last_revision()
1452
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1453
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1454
                return None
1455
            return old_tip
1456
        return None
1457
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1458
2230.3.1 by Aaron Bentley
Get branch6 creation working
1459
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1460
1461
    @needs_read_lock
1462
    def last_revision(self):
1463
        """Return last revision id, or None"""
1464
        revision_id = self.control_files.get_utf8('last-revision').read()
1465
        revision_id = revision_id.rstrip('\n')
1466
        if revision_id == _mod_revision.NULL_REVISION:
1467
            revision_id = None
1468
        return revision_id
1469
1470
    @needs_write_lock
1471
    def set_last_revision(self, revision_id):
1472
        self.control_files.put_utf8('last-revision', revision_id + '\n')
1473
1474
    @needs_read_lock
1475
    def revision_history(self):
1476
        """Generate the revision history from last revision
1477
        """
1478
        return self._lefthand_history(self.last_revision())
1479
1480
    @needs_write_lock
1481
    def set_revision_history(self, history):
1482
        """Set the last_revision, not revision history"""
1483
        if len(history) == 0:
1484
            self.set_last_revision('null:')
1485
        else:
1486
            assert history == self._lefthand_history(history[-1])
1487
            self.set_last_revision(history[-1])
2230.3.1 by Aaron Bentley
Get branch6 creation working
1488
2230.3.3 by Aaron Bentley
Add more config testing
1489
    @needs_write_lock
1490
    def set_parent(self, url):
1491
        """Set the parent branch"""
1492
        if isinstance(url, unicode):
1493
            try: 
1494
                url = url.encode('ascii')
1495
            except UnicodeEncodeError:
1496
                raise bzrlib.errors.InvalidURL(url,
1497
                    "Urls must be 7-bit ascii, "
1498
                    "use bzrlib.urlutils.escape")
1499
                
1500
        url = urlutils.relative_url(self.base, url)
1501
        self.get_config().set_user_option('parent_location', url)
1502
1503
    @needs_read_lock
1504
    def get_parent(self):
1505
        """Set the parent branch"""
1506
        return self.get_config().get_user_option('parent_location')
1507
1508
    def set_push_location(self, location):
1509
        """See Branch.set_push_location."""
1510
        self.get_config().set_user_option('push_location', location)
1511
1512
    def set_bound_location(self, location):
1513
        """See Branch.set_push_location."""
1514
        self.get_config().set_user_option('bound_location', location)
1515
1516
    def get_bound_location(self):
1517
        """See Branch.set_push_location."""
1518
        return self.get_config().get_user_option('bound_location')
1519
2230.3.1 by Aaron Bentley
Get branch6 creation working
1520
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1521
class BranchTestProviderAdapter(object):
1522
    """A tool to generate a suite testing multiple branch formats at once.
1523
1524
    This is done by copying the test once for each transport and injecting
1525
    the transport_server, transport_readonly_server, and branch_format
1526
    classes into each copy. Each copy is also given a new id() to make it
1527
    easy to identify.
1528
    """
1529
1530
    def __init__(self, transport_server, transport_readonly_server, formats):
1531
        self._transport_server = transport_server
1532
        self._transport_readonly_server = transport_readonly_server
1533
        self._formats = formats
1534
    
1535
    def adapt(self, test):
1536
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1537
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1538
            new_test = deepcopy(test)
1539
            new_test.transport_server = self._transport_server
1540
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1541
            new_test.bzrdir_format = bzrdir_format
1542
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1543
            def make_new_test_id():
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1544
                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.
1545
                return lambda: new_id
1546
            new_test.id = make_new_test_id()
1547
            result.addTest(new_test)
1548
        return result
1549
1550
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1551
class BranchCheckResult(object):
1552
    """Results of checking branch consistency.
1553
1554
    :see: Branch.check
1555
    """
1556
1557
    def __init__(self, branch):
1558
        self.branch = branch
1559
1560
    def report_results(self, verbose):
1561
        """Report the check results via trace.note.
1562
        
1563
        :param verbose: Requests more detailed display of what was checked,
1564
            if any.
1565
        """
1566
        note('checked branch %s format %s',
1567
             self.branch.base,
1568
             self.branch._format)
1569
1570
1 by mbp at sourcefrog
import from baz patch-364
1571
######################################################################
1572
# predicates
1573
1574
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1575
@deprecated_function(zero_eight)
1576
def is_control_file(*args, **kwargs):
1577
    """See bzrlib.workingtree.is_control_file."""
2094.3.5 by John Arbash Meinel
Fix imports to ensure modules are loaded before they are used
1578
    from bzrlib import workingtree
1579
    return workingtree.is_control_file(*args, **kwargs)