~bzr-pqm/bzr/bzr.dev

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