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