~bzr-pqm/bzr/bzr.dev

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