/brz/remove-bazaar

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