/brz/remove-bazaar

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