~bzr-pqm/bzr/bzr.dev

70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
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.
7
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.
12
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
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
18
import shutil
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
19
import sys
20
import os
1371 by Martin Pool
- raise NotBranchError if format file can't be read
21
import errno
1372 by Martin Pool
- avoid converting inventories to/from StringIO
22
from warnings import warn
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
23
from cStringIO import StringIO
1372 by Martin Pool
- avoid converting inventories to/from StringIO
24
1 by mbp at sourcefrog
import from baz patch-364
25
26
import bzrlib
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
27
import bzrlib.inventory as inventory
800 by Martin Pool
Merge John's import-speedup branch:
28
from bzrlib.trace import mutter, note
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
29
from bzrlib.osutils import (isdir, quotefn,
1390 by Robert Collins
pair programming worx... merge integration and weave
30
                            rename, splitpath, sha_file, appendpath, 
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
31
                            file_kind, abspath)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
32
import bzrlib.errors as errors
1192 by Martin Pool
- clean up code for retrieving stored inventories
33
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
1299 by Martin Pool
- tidy up imports
34
                           NoSuchRevision, HistoryMissing, NotBranchError,
1391 by Robert Collins
merge from integration
35
                           DivergedBranches, LockError, UnlistableStore,
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
36
                           UnlistableBranch, NoSuchFile, NotVersionedError,
37
                           NoWorkingTree)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
38
from bzrlib.textui import show_status
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
39
from bzrlib.revision import (Revision, is_ancestor, get_intervening_revisions,
40
                             NULL_REVISION)
1185.12.44 by abentley
Restored branch convergence to bzr pull
41
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
42
from bzrlib.delta import compare_trees
43
from bzrlib.tree import EmptyTree, RevisionTree
1192 by Martin Pool
- clean up code for retrieving stored inventories
44
from bzrlib.inventory import Inventory
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
45
from bzrlib.store import copy_all
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
46
from bzrlib.store.text import TextStore
1393.2.3 by John Arbash Meinel
Fixing typos, updating stores, getting tests to pass.
47
from bzrlib.store.weave import WeaveStore
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
48
from bzrlib.testament import Testament
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
49
import bzrlib.transactions as transactions
1393.2.4 by John Arbash Meinel
All tests pass.
50
from bzrlib.transport import Transport, get_transport
1189 by Martin Pool
- BROKEN: partial support for commit into weave
51
import bzrlib.xml5
1104 by Martin Pool
- Add a simple UIFactory
52
import bzrlib.ui
1185.35.11 by Aaron Bentley
Added support for branch nicks
53
from config import TreeConfig
1104 by Martin Pool
- Add a simple UIFactory
54
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
55
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
56
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
57
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1429 by Robert Collins
merge in niemeyers prefixed-store patch
58
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
1 by mbp at sourcefrog
import from baz patch-364
59
## TODO: Maybe include checks for common corruption of newlines, etc?
60
61
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
62
# TODO: Some operations like log might retrieve the same revisions
63
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
64
# cache in memory to make this faster.  In general anything can be
65
# cached in memory between lock and unlock operations.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
66
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
67
def find_branch(*ignored, **ignored_too):
68
    # XXX: leave this here for about one release, then remove it
69
    raise NotImplementedError('find_branch() is not supported anymore, '
70
                              'please use one of the new branch constructors')
416 by Martin Pool
- bzr log and bzr root now accept an http URL
71
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
72
73
def needs_read_lock(unbound):
74
    """Decorate unbound to take out and release a read lock."""
75
    def decorated(self, *args, **kwargs):
76
        self.lock_read()
77
        try:
78
            return unbound(self, *args, **kwargs)
79
        finally:
80
            self.unlock()
81
    return decorated
82
83
84
def needs_write_lock(unbound):
85
    """Decorate unbound to take out and release a write lock."""
86
    def decorated(self, *args, **kwargs):
87
        self.lock_write()
88
        try:
89
            return unbound(self, *args, **kwargs)
90
        finally:
91
            self.unlock()
92
    return decorated
93
1 by mbp at sourcefrog
import from baz patch-364
94
######################################################################
95
# branch objects
96
558 by Martin Pool
- All top-level classes inherit from object
97
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
98
    """Branch holding a history of revisions.
99
343 by Martin Pool
doc
100
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
101
        Base directory/url of the branch.
102
    """
103
    base = None
104
105
    def __init__(self, *ignored, **ignored_too):
106
        raise NotImplementedError('The Branch class is abstract')
107
108
    @staticmethod
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
109
    def open_downlevel(base):
110
        """Open a branch which may be of an old format.
111
        
112
        Only local branches are supported."""
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
113
        return BzrBranch(get_transport(base), relax_version_check=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
114
        
115
    @staticmethod
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
116
    def open(base):
117
        """Open an existing branch, rooted at 'base' (url)"""
1393.2.4 by John Arbash Meinel
All tests pass.
118
        t = get_transport(base)
1393.1.63 by Martin Pool
- add some trace statements
119
        mutter("trying to open %r with transport %r", base, t)
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
120
        return BzrBranch(t)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
121
122
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
123
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
124
        """Open an existing branch which contains url.
125
        
126
        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
127
128
        Basically we keep looking up until we find the control directory or
129
        run into the root.  If there isn't one, raises NotBranchError.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
130
        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.
131
        """
1393.2.4 by John Arbash Meinel
All tests pass.
132
        t = get_transport(url)
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
133
        while True:
134
            try:
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
135
                return BzrBranch(t), t.relpath(url)
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
136
            except NotBranchError:
137
                pass
138
            new_t = t.clone('..')
139
            if new_t.base == t.base:
140
                # reached the root, whatever that may be
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
141
                raise NotBranchError(path=url)
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
142
            t = new_t
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
143
144
    @staticmethod
145
    def initialize(base):
146
        """Create a new branch, rooted at 'base' (url)"""
1393.2.4 by John Arbash Meinel
All tests pass.
147
        t = get_transport(base)
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
148
        return BzrBranch(t, init=True)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
149
150
    def setup_caching(self, cache_root):
151
        """Subclasses that care about caching should override this, and set
152
        up cached stores located under cache_root.
153
        """
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
154
        self.cache_root = cache_root
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
155
1185.35.11 by Aaron Bentley
Added support for branch nicks
156
    def _get_nick(self):
157
        cfg = self.tree_config()
158
        return cfg.get_option(u"nickname", default=self.base.split('/')[-1])
159
160
    def _set_nick(self, nick):
161
        cfg = self.tree_config()
162
        cfg.set_option(nick, "nickname")
163
        assert cfg.get_option("nickname") == nick
164
165
    nick = property(_get_nick, _set_nick)
166
        
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
167
    def push_stores(self, branch_to):
168
        """Copy the content of this branches store to branch_to."""
169
        raise NotImplementedError('push_stores is abstract')
170
171
    def get_transaction(self):
172
        """Return the current active transaction.
173
174
        If no transaction is active, this returns a passthrough object
175
        for which all data is immediately flushed and no caching happens.
176
        """
177
        raise NotImplementedError('get_transaction is abstract')
178
179
    def lock_write(self):
180
        raise NotImplementedError('lock_write is abstract')
181
        
182
    def lock_read(self):
183
        raise NotImplementedError('lock_read is abstract')
184
185
    def unlock(self):
186
        raise NotImplementedError('unlock is abstract')
187
188
    def abspath(self, name):
189
        """Return absolute filename for something in the branch
190
        
191
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
192
        method and not a tree method.
193
        """
194
        raise NotImplementedError('abspath is abstract')
195
196
    def controlfilename(self, file_or_path):
197
        """Return location relative to branch."""
198
        raise NotImplementedError('controlfilename is abstract')
199
200
    def controlfile(self, file_or_path, mode='r'):
201
        """Open a control file for this branch.
202
203
        There are two classes of file in the control directory: text
204
        and binary.  binary files are untranslated byte streams.  Text
205
        control files are stored with Unix newlines and in UTF-8, even
206
        if the platform or locale defaults are different.
207
208
        Controlfiles should almost never be opened in write mode but
209
        rather should be atomically copied and replaced using atomicfile.
210
        """
211
        raise NotImplementedError('controlfile is abstract')
212
213
    def put_controlfile(self, path, f, encode=True):
214
        """Write an entry as a controlfile.
215
216
        :param path: The path to put the file, relative to the .bzr control
217
                     directory
218
        :param f: A file-like or string object whose contents should be copied.
219
        :param encode:  If true, encode the contents as utf-8
220
        """
221
        raise NotImplementedError('put_controlfile is abstract')
222
223
    def put_controlfiles(self, files, encode=True):
224
        """Write several entries as controlfiles.
225
226
        :param files: A list of [(path, file)] pairs, where the path is the directory
227
                      underneath the bzr control directory
228
        :param encode:  If true, encode the contents as utf-8
229
        """
230
        raise NotImplementedError('put_controlfiles is abstract')
231
232
    def get_root_id(self):
233
        """Return the id of this branches root"""
234
        raise NotImplementedError('get_root_id is abstract')
235
236
    def set_root_id(self, file_id):
237
        raise NotImplementedError('set_root_id is abstract')
238
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
239
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
240
        """Print `file` to stdout."""
241
        raise NotImplementedError('print_file is abstract')
242
243
    def append_revision(self, *revision_ids):
244
        raise NotImplementedError('append_revision is abstract')
245
246
    def set_revision_history(self, rev_history):
247
        raise NotImplementedError('set_revision_history is abstract')
248
249
    def has_revision(self, revision_id):
250
        """True if this branch has a copy of the revision.
251
252
        This does not necessarily imply the revision is merge
253
        or on the mainline."""
254
        raise NotImplementedError('has_revision is abstract')
255
256
    def get_revision_xml(self, revision_id):
257
        raise NotImplementedError('get_revision_xml is abstract')
258
259
    def get_revision(self, revision_id):
260
        """Return the Revision object for a named revision"""
261
        raise NotImplementedError('get_revision is abstract')
262
263
    def get_revision_delta(self, revno):
264
        """Return the delta for one revision.
265
266
        The delta is relative to its mainline predecessor, or the
267
        empty tree for revision 1.
268
        """
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
269
        assert isinstance(revno, int)
270
        rh = self.revision_history()
271
        if not (1 <= revno <= len(rh)):
272
            raise InvalidRevisionNumber(revno)
273
274
        # revno is 1-based; list is 0-based
275
276
        new_tree = self.revision_tree(rh[revno-1])
277
        if revno == 1:
278
            old_tree = EmptyTree()
279
        else:
280
            old_tree = self.revision_tree(rh[revno-2])
281
282
        return compare_trees(old_tree, new_tree)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
283
284
    def get_revision_sha1(self, revision_id):
285
        """Hash the stored value of a revision, and return it."""
286
        raise NotImplementedError('get_revision_sha1 is abstract')
287
288
    def get_ancestry(self, revision_id):
289
        """Return a list of revision-ids integrated by a revision.
290
        
291
        This currently returns a list, but the ordering is not guaranteed:
292
        treat it as a set.
293
        """
294
        raise NotImplementedError('get_ancestry is abstract')
295
296
    def get_inventory(self, revision_id):
297
        """Get Inventory object by hash."""
298
        raise NotImplementedError('get_inventory is abstract')
299
300
    def get_inventory_xml(self, revision_id):
301
        """Get inventory XML as a file object."""
302
        raise NotImplementedError('get_inventory_xml is abstract')
303
304
    def get_inventory_sha1(self, revision_id):
305
        """Return the sha1 hash of the inventory entry."""
306
        raise NotImplementedError('get_inventory_sha1 is abstract')
307
308
    def get_revision_inventory(self, revision_id):
309
        """Return inventory of a past revision."""
310
        raise NotImplementedError('get_revision_inventory is abstract')
311
312
    def revision_history(self):
313
        """Return sequence of revision hashes on to this branch."""
314
        raise NotImplementedError('revision_history is abstract')
315
316
    def revno(self):
317
        """Return current revision number for this branch.
318
319
        That is equivalent to the number of revisions committed to
320
        this branch.
321
        """
322
        return len(self.revision_history())
323
324
    def last_revision(self):
325
        """Return last patch hash, or None if no history."""
326
        ph = self.revision_history()
327
        if ph:
328
            return ph[-1]
329
        else:
330
            return None
331
332
    def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
333
        """Return a list of new revisions that would perfectly fit.
334
        
335
        If self and other have not diverged, return a list of the revisions
336
        present in other, but missing from self.
337
338
        >>> from bzrlib.commit import commit
339
        >>> bzrlib.trace.silent = True
340
        >>> br1 = ScratchBranch()
341
        >>> br2 = ScratchBranch()
342
        >>> br1.missing_revisions(br2)
343
        []
344
        >>> commit(br2, "lala!", rev_id="REVISION-ID-1")
345
        >>> br1.missing_revisions(br2)
346
        [u'REVISION-ID-1']
347
        >>> br2.missing_revisions(br1)
348
        []
349
        >>> commit(br1, "lala!", rev_id="REVISION-ID-1")
350
        >>> br1.missing_revisions(br2)
351
        []
352
        >>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
353
        >>> br1.missing_revisions(br2)
354
        [u'REVISION-ID-2A']
355
        >>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
356
        >>> br1.missing_revisions(br2)
357
        Traceback (most recent call last):
358
        DivergedBranches: These branches have diverged.
359
        """
360
        self_history = self.revision_history()
361
        self_len = len(self_history)
362
        other_history = other.revision_history()
363
        other_len = len(other_history)
364
        common_index = min(self_len, other_len) -1
365
        if common_index >= 0 and \
366
            self_history[common_index] != other_history[common_index]:
367
            raise DivergedBranches(self, other)
368
369
        if stop_revision is None:
370
            stop_revision = other_len
371
        else:
372
            assert isinstance(stop_revision, int)
373
            if stop_revision > other_len:
374
                raise bzrlib.errors.NoSuchRevision(self, stop_revision)
375
        return other_history[self_len:stop_revision]
376
    
377
    def update_revisions(self, other, stop_revision=None):
378
        """Pull in new perfect-fit revisions."""
379
        raise NotImplementedError('update_revisions is abstract')
380
381
    def pullable_revisions(self, other, stop_revision):
382
        raise NotImplementedError('pullable_revisions is abstract')
383
        
384
    def revision_id_to_revno(self, revision_id):
385
        """Given a revision id, return its revno"""
386
        if revision_id is None:
387
            return 0
388
        history = self.revision_history()
389
        try:
390
            return history.index(revision_id) + 1
391
        except ValueError:
392
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
393
394
    def get_rev_id(self, revno, history=None):
395
        """Find the revision id of the specified revno."""
396
        if revno == 0:
397
            return None
398
        if history is None:
399
            history = self.revision_history()
400
        elif revno <= 0 or revno > len(history):
401
            raise bzrlib.errors.NoSuchRevision(self, revno)
402
        return history[revno - 1]
403
404
    def revision_tree(self, revision_id):
405
        """Return Tree for a revision on this branch.
406
407
        `revision_id` may be None for the null revision, in which case
408
        an `EmptyTree` is returned."""
409
        raise NotImplementedError('revision_tree is abstract')
410
411
    def working_tree(self):
1508.1.15 by Robert Collins
Merge from mpool.
412
        """Return a `Tree` for the working copy if this is a local branch."""
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
413
        raise NotImplementedError('working_tree is abstract')
414
415
    def pull(self, source, overwrite=False):
416
        raise NotImplementedError('pull is abstract')
417
418
    def basis_tree(self):
419
        """Return `Tree` object for last revision.
420
421
        If there are no revisions yet, return an `EmptyTree`.
422
        """
423
        return self.revision_tree(self.last_revision())
424
425
    def rename_one(self, from_rel, to_rel):
426
        """Rename one file.
427
428
        This can change the directory or the filename or both.
429
        """
430
        raise NotImplementedError('rename_one is abstract')
431
432
    def move(self, from_paths, to_name):
433
        """Rename files.
434
435
        to_name must exist as a versioned directory.
436
437
        If to_name exists and is a directory, the files are moved into
438
        it, keeping their old names.  If it is a directory, 
439
440
        Note that to_name is only the last component of the new name;
441
        this doesn't change the directory.
442
443
        This returns a list of (from_path, to_path) pairs for each
444
        entry that is moved.
445
        """
446
        raise NotImplementedError('move is abstract')
447
448
    def get_parent(self):
449
        """Return the parent location of the branch.
450
451
        This is the default location for push/pull/missing.  The usual
452
        pattern is that the user can override it by specifying a
453
        location.
454
        """
455
        raise NotImplementedError('get_parent is abstract')
456
457
    def get_push_location(self):
458
        """Return the None or the location to push this branch to."""
459
        raise NotImplementedError('get_push_location is abstract')
460
461
    def set_push_location(self, location):
462
        """Set a new push location for this branch."""
463
        raise NotImplementedError('set_push_location is abstract')
464
465
    def set_parent(self, url):
466
        raise NotImplementedError('set_parent is abstract')
467
468
    def check_revno(self, revno):
469
        """\
470
        Check whether a revno corresponds to any revision.
471
        Zero (the NULL revision) is considered valid.
472
        """
473
        if revno != 0:
474
            self.check_real_revno(revno)
475
            
476
    def check_real_revno(self, revno):
477
        """\
478
        Check whether a revno corresponds to a real revision.
479
        Zero (the NULL revision) is considered invalid
480
        """
481
        if revno < 1 or revno > self.revno():
482
            raise InvalidRevisionNumber(revno)
483
        
484
    def sign_revision(self, revision_id, gpg_strategy):
485
        raise NotImplementedError('sign_revision is abstract')
486
487
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
488
        raise NotImplementedError('store_revision_signature is abstract')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
489
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
490
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
491
    """A branch stored in the actual filesystem.
492
493
    Note that it's "local" in the context of the filesystem; it doesn't
494
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
495
    it's writable, and can be accessed via the normal filesystem API.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
496
497
    _lock_mode
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
498
        None, or 'r' or 'w'
499
500
    _lock_count
501
        If _lock_mode is true, a positive count of the number of times the
502
        lock has been taken.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
503
614 by Martin Pool
- unify two defintions of LockError
504
    _lock
505
        Lock object from bzrlib.lock.
1 by mbp at sourcefrog
import from baz patch-364
506
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
507
    # We actually expect this class to be somewhat short-lived; part of its
508
    # purpose is to try to isolate what bits of the branch logic are tied to
509
    # filesystem access, so that in a later step, we can extricate them to
510
    # a separarte ("storage") class.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
511
    _lock_mode = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
512
    _lock_count = None
615 by Martin Pool
Major rework of locking code:
513
    _lock = None
1223 by Martin Pool
- store inventories in weave
514
    _inventory_weave = None
353 by Martin Pool
- Per-branch locks in read and write modes.
515
    
897 by Martin Pool
- merge john's revision-naming code
516
    # Map some sort of prefix into a namespace
517
    # stuff like "revno:10", "revid:", etc.
518
    # This should match a prefix with a function which accepts
519
    REVISION_NAMESPACES = {}
520
1391 by Robert Collins
merge from integration
521
    def push_stores(self, branch_to):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
522
        """See Branch.push_stores."""
1391 by Robert Collins
merge from integration
523
        if (self._branch_format != branch_to._branch_format
524
            or self._branch_format != 4):
525
            from bzrlib.fetch import greedy_fetch
1393 by Robert Collins
reenable remotebranch tests
526
            mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
527
                   self, self._branch_format, branch_to, branch_to._branch_format)
1391 by Robert Collins
merge from integration
528
            greedy_fetch(to_branch=branch_to, from_branch=self,
529
                         revision=self.last_revision())
530
            return
531
532
        store_pairs = ((self.text_store,      branch_to.text_store),
533
                       (self.inventory_store, branch_to.inventory_store),
534
                       (self.revision_store,  branch_to.revision_store))
535
        try:
536
            for from_store, to_store in store_pairs: 
537
                copy_all(from_store, to_store)
538
        except UnlistableStore:
539
            raise UnlistableBranch(from_store)
540
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
541
    def __init__(self, transport, init=False,
1293 by Martin Pool
- add Branch constructor option to relax version check
542
                 relax_version_check=False):
1 by mbp at sourcefrog
import from baz patch-364
543
        """Create new branch object at a particular location.
544
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
545
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
546
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
547
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
548
             unversioned directory.  If False, the branch must already
549
             be versioned.
550
1293 by Martin Pool
- add Branch constructor option to relax version check
551
        relax_version_check -- If true, the usual check for the branch
552
            version is not applied.  This is intended only for
553
            upgrade/recovery type use; it's not guaranteed that
554
            all operations will work on old format branches.
555
1 by mbp at sourcefrog
import from baz patch-364
556
        In the test suite, creation of new trees is tested using the
557
        `ScratchBranch` class.
558
        """
1393.1.15 by Martin Pool
- better assertion message
559
        assert isinstance(transport, Transport), \
560
            "%r is not a Transport" % transport
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
561
        self._transport = transport
1 by mbp at sourcefrog
import from baz patch-364
562
        if init:
563
            self._make_control()
1293 by Martin Pool
- add Branch constructor option to relax version check
564
        self._check_format(relax_version_check)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
565
1429 by Robert Collins
merge in niemeyers prefixed-store patch
566
        def get_store(name, compressed=True, prefixed=False):
1393.1.41 by Martin Pool
doc
567
            # FIXME: This approach of assuming stores are all entirely compressed
568
            # or entirely uncompressed is tidy, but breaks upgrade from 
569
            # some existing branches where there's a mixture; we probably 
570
            # still want the option to look for both.
1185.33.87 by Martin Pool
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
571
            relpath = self._rel_controlfilename(unicode(name))
1185.16.159 by John Arbash Meinel
Updated the stores, all tests pass, and a store doesn't have to be 100% compressed
572
            store = TextStore(self._transport.clone(relpath),
573
                              prefixed=prefixed,
574
                              compressed=compressed)
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
575
            #if self._transport.should_cache():
576
            #    cache_path = os.path.join(self.cache_root, name)
577
            #    os.mkdir(cache_path)
578
            #    store = bzrlib.store.CachedStore(store, cache_path)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
579
            return store
1185.33.87 by Martin Pool
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
580
1429 by Robert Collins
merge in niemeyers prefixed-store patch
581
        def get_weave(name, prefixed=False):
1185.33.87 by Martin Pool
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
582
            relpath = self._rel_controlfilename(unicode(name))
1429 by Robert Collins
merge in niemeyers prefixed-store patch
583
            ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
584
            if self._transport.should_cache():
585
                ws.enable_cache = True
586
            return ws
587
1296 by Martin Pool
- v4 branch should allow access to inventory and text stores
588
        if self._branch_format == 4:
1185.33.87 by Martin Pool
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
589
            self.inventory_store = get_store('inventory-store')
590
            self.text_store = get_store('text-store')
591
            self.revision_store = get_store('revision-store')
1390 by Robert Collins
pair programming worx... merge integration and weave
592
        elif self._branch_format == 5:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
593
            self.control_weaves = get_weave(u'')
594
            self.weave_store = get_weave(u'weaves')
595
            self.revision_store = get_store(u'revision-store', compressed=False)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
596
        elif self._branch_format == 6:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
597
            self.control_weaves = get_weave(u'')
598
            self.weave_store = get_weave(u'weaves', prefixed=True)
599
            self.revision_store = get_store(u'revision-store', compressed=False,
1429 by Robert Collins
merge in niemeyers prefixed-store patch
600
                                            prefixed=True)
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
601
        self.revision_store.register_suffix('sig')
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
602
        self._transaction = None
1 by mbp at sourcefrog
import from baz patch-364
603
604
    def __str__(self):
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
605
        return '%s(%r)' % (self.__class__.__name__, self._transport.base)
1 by mbp at sourcefrog
import from baz patch-364
606
607
    __repr__ = __str__
608
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
609
    def __del__(self):
615 by Martin Pool
Major rework of locking code:
610
        if self._lock_mode or self._lock:
1390 by Robert Collins
pair programming worx... merge integration and weave
611
            # XXX: This should show something every time, and be suitable for
612
            # headless operation and embedding
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
613
            warn("branch %r was not explicitly unlocked" % self)
615 by Martin Pool
Major rework of locking code:
614
            self._lock.unlock()
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
615
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
616
        # TODO: It might be best to do this somewhere else,
617
        # but it is nice for a Branch object to automatically
618
        # cache it's information.
619
        # Alternatively, we could have the Transport objects cache requests
620
        # See the earlier discussion about how major objects (like Branch)
621
        # should never expect their __del__ function to run.
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
622
        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.
623
            try:
624
                shutil.rmtree(self.cache_root)
625
            except:
626
                pass
627
            self.cache_root = None
628
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
629
    def _get_base(self):
907.1.19 by John Arbash Meinel
Updated ScratchBranch and Branch.base, All Tests PASS !!!
630
        if self._transport:
631
            return self._transport.base
632
        return None
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
633
1442.1.5 by Robert Collins
Give branch.base a docstring.
634
    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,
635
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
636
    def _finish_transaction(self):
637
        """Exit the current transaction."""
638
        if self._transaction is None:
639
            raise errors.LockError('Branch %s is not in a transaction' %
640
                                   self)
641
        transaction = self._transaction
642
        self._transaction = None
643
        transaction.finish()
644
645
    def get_transaction(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
646
        """See Branch.get_transaction."""
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
647
        if self._transaction is None:
648
            return transactions.PassThroughTransaction()
649
        else:
650
            return self._transaction
651
652
    def _set_transaction(self, new_transaction):
653
        """Set a new active transaction."""
654
        if self._transaction is not None:
655
            raise errors.LockError('Branch %s is in a transaction already.' %
656
                                   self)
657
        self._transaction = new_transaction
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
658
659
    def lock_write(self):
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
660
        #mutter("lock write: %s (%s)", self, self._lock_count)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
661
        # TODO: Upgrade locking to support using a Transport,
662
        # and potentially a remote locking protocol
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
663
        if self._lock_mode:
664
            if self._lock_mode != 'w':
665
                raise LockError("can't upgrade to a write lock from %r" %
666
                                self._lock_mode)
667
            self._lock_count += 1
668
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
669
            self._lock = self._transport.lock_write(
670
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
671
            self._lock_mode = 'w'
672
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
673
            self._set_transaction(transactions.PassThroughTransaction())
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
674
675
    def lock_read(self):
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
676
        #mutter("lock read: %s (%s)", self, self._lock_count)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
677
        if self._lock_mode:
678
            assert self._lock_mode in ('r', 'w'), \
679
                   "invalid lock mode %r" % self._lock_mode
680
            self._lock_count += 1
681
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
682
            self._lock = self._transport.lock_read(
683
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
684
            self._lock_mode = 'r'
685
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
686
            self._set_transaction(transactions.ReadOnlyTransaction())
1417.1.10 by Robert Collins
add a cache bound to Transactions, and a precious facility, so that we keep inventory.weave in memory, but can discard weaves for other such files.
687
            # 5K may be excessive, but hey, its a knob.
688
            self.get_transaction().set_cache_size(5000)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
689
                        
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
690
    def unlock(self):
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
691
        #mutter("unlock: %s (%s)", self, self._lock_count)
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
692
        if not self._lock_mode:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
693
            raise LockError('branch %r is not locked' % (self))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
694
695
        if self._lock_count > 1:
696
            self._lock_count -= 1
697
        else:
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
698
            self._finish_transaction()
615 by Martin Pool
Major rework of locking code:
699
            self._lock.unlock()
700
            self._lock = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
701
            self._lock_mode = self._lock_count = None
353 by Martin Pool
- Per-branch locks in read and write modes.
702
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
703
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
704
        """See Branch.abspath."""
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
705
        return self._transport.abspath(name)
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
706
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
707
    def _rel_controlfilename(self, file_or_path):
1469 by Robert Collins
Change Transport.* to work with URL's.
708
        if not isinstance(file_or_path, basestring):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
709
            file_or_path = u'/'.join(file_or_path)
1469 by Robert Collins
Change Transport.* to work with URL's.
710
        if file_or_path == '':
711
            return bzrlib.BZRDIR
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
712
        return bzrlib.transport.urlescape(bzrlib.BZRDIR + u'/' + file_or_path)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
713
1 by mbp at sourcefrog
import from baz patch-364
714
    def controlfilename(self, file_or_path):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
715
        """See Branch.controlfilename."""
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
716
        return self._transport.abspath(self._rel_controlfilename(file_or_path))
1 by mbp at sourcefrog
import from baz patch-364
717
718
    def controlfile(self, file_or_path, mode='r'):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
719
        """See Branch.controlfile."""
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
720
        import codecs
721
722
        relpath = self._rel_controlfilename(file_or_path)
723
        #TODO: codecs.open() buffers linewise, so it was overloaded with
724
        # a much larger buffer, do we need to do the same for getreader/getwriter?
725
        if mode == 'rb': 
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
726
            return self._transport.get(relpath)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
727
        elif mode == 'wb':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
728
            raise BzrError("Branch.controlfile(mode='wb') is not supported, use put_controlfiles")
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
729
        elif mode == 'r':
1185.16.149 by Martin Pool
doc
730
            # XXX: Do we really want errors='replace'?   Perhaps it should be
731
            # an error, or at least reported, if there's incorrectly-encoded
732
            # data inside a file.
733
            # <https://launchpad.net/products/bzr/+bug/3823>
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
734
            return codecs.getreader('utf-8')(self._transport.get(relpath), errors='replace')
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
735
        elif mode == 'w':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
736
            raise BzrError("Branch.controlfile(mode='w') is not supported, use put_controlfiles")
245 by mbp at sourcefrog
- control files always in utf-8-unix format
737
        else:
738
            raise BzrError("invalid controlfile mode %r" % mode)
739
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
740
    def put_controlfile(self, path, f, encode=True):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
741
        """See Branch.put_controlfile."""
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
742
        self.put_controlfiles([(path, f)], encode=encode)
743
744
    def put_controlfiles(self, files, encode=True):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
745
        """See Branch.put_controlfiles."""
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
746
        import codecs
747
        ctrl_files = []
748
        for path, f in files:
749
            if encode:
750
                if isinstance(f, basestring):
751
                    f = f.encode('utf-8', 'replace')
752
                else:
753
                    f = codecs.getwriter('utf-8')(f, errors='replace')
754
            path = self._rel_controlfilename(path)
755
            ctrl_files.append((path, f))
756
        self._transport.put_multi(ctrl_files)
1 by mbp at sourcefrog
import from baz patch-364
757
758
    def _make_control(self):
800 by Martin Pool
Merge John's import-speedup branch:
759
        from bzrlib.inventory import Inventory
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
760
        from bzrlib.weavefile import write_weave_v5
761
        from bzrlib.weave import Weave
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
762
        
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
763
        # Create an empty inventory
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
764
        sio = StringIO()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
765
        # if we want per-tree root ids then this is the place to set
766
        # them; they're not needed for now and so ommitted for
767
        # simplicity.
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
768
        bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
769
        empty_inv = sio.getvalue()
770
        sio = StringIO()
771
        bzrlib.weavefile.write_weave_v5(Weave(), sio)
772
        empty_weave = sio.getvalue()
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
773
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
774
        dirs = [[], 'revision-store', 'weaves']
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
775
        files = [('README', 
1 by mbp at sourcefrog
import from baz patch-364
776
            "This is a Bazaar-NG control directory.\n"
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
777
            "Do not change any files in this directory.\n"),
1429 by Robert Collins
merge in niemeyers prefixed-store patch
778
            ('branch-format', BZR_BRANCH_FORMAT_6),
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
779
            ('revision-history', ''),
780
            ('branch-name', ''),
781
            ('branch-lock', ''),
782
            ('pending-merges', ''),
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
783
            ('inventory', empty_inv),
784
            ('inventory.weave', empty_weave),
785
            ('ancestry.weave', empty_weave)
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
786
        ]
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
787
        cfn = self._rel_controlfilename
788
        self._transport.mkdir_multi([cfn(d) for d in dirs])
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
789
        self.put_controlfiles(files)
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
790
        mutter('created control directory in ' + self._transport.base)
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
791
1293 by Martin Pool
- add Branch constructor option to relax version check
792
    def _check_format(self, relax_version_check):
1 by mbp at sourcefrog
import from baz patch-364
793
        """Check this branch format is supported.
794
1187 by Martin Pool
- improved check for branch version
795
        The format level is stored, as an integer, in
796
        self._branch_format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
797
798
        In the future, we might need different in-memory Branch
799
        classes to support downlevel branches.  But not yet.
163 by mbp at sourcefrog
merge win32 portability fixes
800
        """
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
801
        try:
802
            fmt = self.controlfile('branch-format', 'r').read()
803
        except NoSuchFile:
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
804
            raise NotBranchError(path=self.base)
1393.1.63 by Martin Pool
- add some trace statements
805
        mutter("got branch format %r", fmt)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
806
        if fmt == BZR_BRANCH_FORMAT_6:
807
            self._branch_format = 6
808
        elif fmt == BZR_BRANCH_FORMAT_5:
1187 by Martin Pool
- improved check for branch version
809
            self._branch_format = 5
1294 by Martin Pool
- refactor branch version detection
810
        elif fmt == BZR_BRANCH_FORMAT_4:
811
            self._branch_format = 4
812
813
        if (not relax_version_check
1429 by Robert Collins
merge in niemeyers prefixed-store patch
814
            and self._branch_format not in (5, 6)):
1185.1.53 by Robert Collins
raise a specific error on unsupported branches so that they can be distinguished from generic errors
815
            raise errors.UnsupportedFormatError(
816
                           'sorry, branch format %r not supported' % fmt,
576 by Martin Pool
- raise exceptions rather than using bailout()
817
                           ['use a different bzr version',
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
818
                            'or remove the .bzr directory'
819
                            ' and "bzr init" again'])
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
820
1508.1.15 by Robert Collins
Merge from mpool.
821
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
822
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
823
        """See Branch.get_root_id."""
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
824
        inv = self.get_inventory(self.last_revision())
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
825
        return inv.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
826
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
827
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
828
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
829
        """See Branch.print_file."""
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
830
        tree = self.revision_tree(revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
831
        # use inventory as it was in that revision
832
        file_id = tree.inventory.path2id(file)
833
        if not file_id:
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
834
            try:
835
                revno = self.revision_id_to_revno(revision_id)
836
            except errors.NoSuchRevision:
837
                # TODO: This should not be BzrError,
838
                # but NoSuchFile doesn't fit either
839
                raise BzrError('%r is not present in revision %s' 
840
                                % (file, revision_id))
841
            else:
842
                raise BzrError('%r is not present in revision %s'
843
                                % (file, revno))
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
844
        tree.print_file(file_id)
845
846
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
847
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
848
        """See Branch.append_revision."""
905 by Martin Pool
- merge aaron's append_multiple.patch
849
        for revision_id in revision_ids:
850
            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.
851
        rev_history = self.revision_history()
852
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
853
        self.set_revision_history(rev_history)
854
855
    @needs_write_lock
856
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
857
        """See Branch.set_revision_history."""
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
858
        old_revision = self.last_revision()
859
        new_revision = rev_history[-1]
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
860
        self.put_controlfile('revision-history', '\n'.join(rev_history))
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
861
        try:
862
            self.working_tree().set_last_revision(new_revision, old_revision)
863
        except NoWorkingTree:
864
            mutter('Unable to set_last_revision without a working tree.')
233 by mbp at sourcefrog
- more output from test.sh
865
1261 by Martin Pool
- new method Branch.has_revision
866
    def has_revision(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
867
        """See Branch.has_revision."""
1390 by Robert Collins
pair programming worx... merge integration and weave
868
        return (revision_id is None
1442.1.45 by Robert Collins
replace __contains__ calls in stores with has_id
869
                or self.revision_store.has_id(revision_id))
1261 by Martin Pool
- new method Branch.has_revision
870
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
871
    @needs_read_lock
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
872
    def _get_revision_xml_file(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
873
        if not revision_id or not isinstance(revision_id, basestring):
1185.16.103 by mbp at sourcefrog
Fix up all calls to InvalidRevisionId() to specify parameters.
874
            raise InvalidRevisionId(revision_id=revision_id, branch=self)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
875
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
876
            return self.revision_store.get(revision_id)
877
        except (IndexError, KeyError):
878
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
879
1231 by Martin Pool
- more progress on fetch on top of weaves
880
    def get_revision_xml(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
881
        """See Branch.get_revision_xml."""
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
882
        return self._get_revision_xml_file(revision_id).read()
1231 by Martin Pool
- more progress on fetch on top of weaves
883
1 by mbp at sourcefrog
import from baz patch-364
884
    def get_revision(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
885
        """See Branch.get_revision."""
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
886
        xml_file = self._get_revision_xml_file(revision_id)
1027 by Martin Pool
- better error message when failing to get revision from store
887
888
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
889
            r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
890
        except SyntaxError, e:
891
            raise bzrlib.errors.BzrError('failed to unpack revision_xml',
892
                                         [revision_id,
893
                                          str(e)])
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
894
            
1 by mbp at sourcefrog
import from baz patch-364
895
        assert r.revision_id == revision_id
896
        return r
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
897
672 by Martin Pool
- revision records include the hash of their inventory and
898
    def get_revision_sha1(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
899
        """See Branch.get_revision_sha1."""
672 by Martin Pool
- revision records include the hash of their inventory and
900
        # In the future, revision entries will be signed. At that
901
        # point, it is probably best *not* to include the signature
902
        # in the revision hash. Because that lets you re-sign
903
        # the revision, (add signatures/remove signatures) and still
904
        # have all hash pointers stay consistent.
905
        # But for now, just hash the contents.
1230 by Martin Pool
- remove Branch.get_revision_xml; use get_revision_xml_file instead
906
        return bzrlib.osutils.sha_file(self.get_revision_xml_file(revision_id))
672 by Martin Pool
- revision records include the hash of their inventory and
907
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
908
    def get_ancestry(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
909
        """See Branch.get_ancestry."""
1390 by Robert Collins
pair programming worx... merge integration and weave
910
        if revision_id is None:
911
            return [None]
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
912
        w = self._get_inventory_weave()
1415 by Robert Collins
remove the ancestry weave file
913
        return [None] + map(w.idx_to_name,
914
                            w.inclusions([w.lookup(revision_id)]))
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
915
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
916
    def _get_inventory_weave(self):
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
917
        return self.control_weaves.get_weave('inventory',
918
                                             self.get_transaction())
1223 by Martin Pool
- store inventories in weave
919
1192 by Martin Pool
- clean up code for retrieving stored inventories
920
    def get_inventory(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
921
        """See Branch.get_inventory."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
922
        xml = self.get_inventory_xml(revision_id)
923
        return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
924
1192 by Martin Pool
- clean up code for retrieving stored inventories
925
    def get_inventory_xml(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
926
        """See Branch.get_inventory_xml."""
1192 by Martin Pool
- clean up code for retrieving stored inventories
927
        try:
928
            assert isinstance(revision_id, basestring), type(revision_id)
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
929
            iw = self._get_inventory_weave()
1223 by Martin Pool
- store inventories in weave
930
            return iw.get_text(iw.lookup(revision_id))
1192 by Martin Pool
- clean up code for retrieving stored inventories
931
        except IndexError:
932
            raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
933
1192 by Martin Pool
- clean up code for retrieving stored inventories
934
    def get_inventory_sha1(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
935
        """See Branch.get_inventory_sha1."""
1223 by Martin Pool
- store inventories in weave
936
        return self.get_revision(revision_id).inventory_sha1
672 by Martin Pool
- revision records include the hash of their inventory and
937
1 by mbp at sourcefrog
import from baz patch-364
938
    def get_revision_inventory(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
939
        """See Branch.get_revision_inventory."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
940
        # TODO: Unify this with get_inventory()
1218 by Martin Pool
- fix up import
941
        # bzr 0.0.6 and later imposes the constraint that the inventory_id
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
942
        # must be the same as its revision, so this is trivial.
1 by mbp at sourcefrog
import from baz patch-364
943
        if revision_id == None:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
944
            # This does not make sense: if there is no revision,
945
            # then it is the current tree inventory surely ?!
946
            # and thus get_root_id() is something that looks at the last
947
            # commit on the branch, and the get_root_id is an inventory check.
948
            raise NotImplementedError
949
            # return Inventory(self.get_root_id())
1 by mbp at sourcefrog
import from baz patch-364
950
        else:
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
951
            return self.get_inventory(revision_id)
1 by mbp at sourcefrog
import from baz patch-364
952
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
953
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
954
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
955
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
956
        transaction = self.get_transaction()
957
        history = transaction.map.find_revision_history()
958
        if history is not None:
959
            mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
960
            return list(history)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
961
        history = [l.rstrip('\r\n') for l in
962
                self.controlfile('revision-history', 'r').readlines()]
963
        transaction.map.add_revision_history(history)
964
        # this call is disabled because revision_history is 
965
        # not really an object yet, and the transaction is for objects.
966
        # transaction.register_clean(history, precious=True)
967
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
968
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
969
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
970
        """See Branch.update_revisions."""
974.1.33 by aaron.bentley at utoronto
Added greedy_fetch to update_revisions
971
        from bzrlib.fetch import greedy_fetch
974.1.75 by Aaron Bentley
Sped up pull by copying locally first
972
        if stop_revision is None:
1390 by Robert Collins
pair programming worx... merge integration and weave
973
            stop_revision = other.last_revision()
1185.12.44 by abentley
Restored branch convergence to bzr pull
974
        ### Should this be checking is_ancestor instead of revision_history?
1441 by Robert Collins
tests passing is a good idea - move the branch open in cmd_branch to ensure this, and remove noise from the test suite
975
        if (stop_revision is not None and 
976
            stop_revision in self.revision_history()):
1440 by Robert Collins
further tuning of pull, do not do a local merge or fetch at all, if the remote branch is no newer than we are
977
            return
1260 by Martin Pool
- some updates for fetch/update function
978
        greedy_fetch(to_branch=self, from_branch=other,
1261 by Martin Pool
- new method Branch.has_revision
979
                     revision=stop_revision)
1185.12.44 by abentley
Restored branch convergence to bzr pull
980
        pullable_revs = self.pullable_revisions(other, stop_revision)
1185.12.45 by abentley
Cleanups for pull
981
        if len(pullable_revs) > 0:
1261 by Martin Pool
- new method Branch.has_revision
982
            self.append_revision(*pullable_revs)
1185.12.44 by abentley
Restored branch convergence to bzr pull
983
984
    def pullable_revisions(self, other, stop_revision):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
985
        """See Branch.pullable_revisions."""
1185.12.44 by abentley
Restored branch convergence to bzr pull
986
        other_revno = other.revision_id_to_revno(stop_revision)
987
        try:
988
            return self.missing_revisions(other, other_revno)
989
        except DivergedBranches, e:
990
            try:
991
                pullable_revs = get_intervening_revisions(self.last_revision(),
992
                                                          stop_revision, self)
993
                assert self.last_revision() not in pullable_revs
994
                return pullable_revs
995
            except bzrlib.errors.NotAncestor:
996
                if is_ancestor(self.last_revision(), stop_revision, self):
997
                    return []
998
                else:
999
                    raise e
1000
        
1 by mbp at sourcefrog
import from baz patch-364
1001
    def revision_tree(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1002
        """See Branch.revision_tree."""
529 by Martin Pool
todo
1003
        # TODO: refactor this to use an existing revision object
1004
        # so we don't need to read it in twice.
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
1005
        if revision_id == None or revision_id == NULL_REVISION:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1006
            return EmptyTree()
1 by mbp at sourcefrog
import from baz patch-364
1007
        else:
1008
            inv = self.get_revision_inventory(revision_id)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
1009
            return RevisionTree(self.weave_store, inv, revision_id)
1 by mbp at sourcefrog
import from baz patch-364
1010
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1011
    def basis_tree(self):
1012
        """See Branch.basis_tree."""
1013
        try:
1014
            revision_id = self.revision_history()[-1]
1015
            xml = self.working_tree().read_basis_inventory(revision_id)
1016
            inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
1017
            return RevisionTree(self.weave_store, inv, revision_id)
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
1018
        except (IndexError, NoSuchFile, NoWorkingTree), e:
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1019
            return self.revision_tree(self.last_revision())
1020
1 by mbp at sourcefrog
import from baz patch-364
1021
    def working_tree(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1022
        """See Branch.working_tree."""
1185.2.2 by Lalo Martins
cleaning up and refactoring the branch module.
1023
        from bzrlib.workingtree import WorkingTree
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1024
        if self._transport.base.find('://') != -1:
1025
            raise NoWorkingTree(self.base)
1457.1.1 by Robert Collins
rather than getting the branch inventory, WorkingTree can use the whole Branch, or make its own.
1026
        return WorkingTree(self.base, branch=self)
1 by mbp at sourcefrog
import from baz patch-364
1027
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1028
    @needs_write_lock
1029
    def pull(self, source, overwrite=False):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1030
        """See Branch.pull."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1031
        source.lock_read()
1032
        try:
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1033
            old_count = len(self.revision_history())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1034
            try:
1035
                self.update_revisions(source)
1036
            except DivergedBranches:
1037
                if not overwrite:
1038
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1039
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1040
                self.set_revision_history(source.revision_history())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1041
            new_count = len(self.revision_history())
1042
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1043
        finally:
1044
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1045
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1046
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1047
        """See Branch.get_parent."""
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1048
        import errno
1049
        _locs = ['parent', 'pull', 'x-pull']
1050
        for l in _locs:
1051
            try:
1052
                return self.controlfile(l, 'r').read().strip('\n')
1185.50.11 by John Arbash Meinel
[merge] Refactor NoSuchFile style exceptions.
1053
            except NoSuchFile:
1054
                pass
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1055
        return None
1056
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1057
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1058
        """See Branch.get_push_location."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1059
        config = bzrlib.config.BranchConfig(self)
1060
        push_loc = config.get_user_option('push_location')
1061
        return push_loc
1062
1063
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1064
        """See Branch.set_push_location."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1065
        config = bzrlib.config.LocationConfig(self.base)
1066
        config.set_user_option('push_location', location)
1067
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1068
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1069
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1070
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1071
        # TODO: Maybe delete old location files?
1072
        from bzrlib.atomicfile import AtomicFile
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1073
        f = AtomicFile(self.controlfilename('parent'))
1150 by Martin Pool
- add new Branch.set_parent and tests
1074
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1075
            f.write(url + '\n')
1076
            f.commit()
1150 by Martin Pool
- add new Branch.set_parent and tests
1077
        finally:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1078
            f.close()
1150 by Martin Pool
- add new Branch.set_parent and tests
1079
1185.35.11 by Aaron Bentley
Added support for branch nicks
1080
    def tree_config(self):
1081
        return TreeConfig(self)
1082
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1083
    def sign_revision(self, revision_id, gpg_strategy):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1084
        """See Branch.sign_revision."""
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
1085
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
1086
        self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1087
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1088
    @needs_write_lock
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
1089
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1090
        """See Branch.store_revision_signature."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1091
        self.revision_store.add(StringIO(gpg_strategy.sign(plaintext)), 
1092
                                revision_id, "sig")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1093
1094
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1095
class ScratchBranch(BzrBranch):
1 by mbp at sourcefrog
import from baz patch-364
1096
    """Special test class: a branch that cleans up after itself.
1097
1098
    >>> b = ScratchBranch()
1099
    >>> isdir(b.base)
1100
    True
1101
    >>> bd = b.base
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1102
    >>> b._transport.__del__()
1 by mbp at sourcefrog
import from baz patch-364
1103
    >>> isdir(bd)
1104
    False
1105
    """
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1106
1107
    def __init__(self, files=[], dirs=[], transport=None):
1 by mbp at sourcefrog
import from baz patch-364
1108
        """Make a test branch.
1109
1110
        This creates a temporary directory and runs init-tree in it.
1111
1112
        If any files are listed, they are created in the working copy.
1113
        """
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1114
        if transport is None:
1115
            transport = bzrlib.transport.local.ScratchTransport()
1116
            super(ScratchBranch, self).__init__(transport, init=True)
1117
        else:
1118
            super(ScratchBranch, self).__init__(transport)
1119
100 by mbp at sourcefrog
- add test case for ignore files
1120
        for d in dirs:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1121
            self._transport.mkdir(d)
100 by mbp at sourcefrog
- add test case for ignore files
1122
            
1 by mbp at sourcefrog
import from baz patch-364
1123
        for f in files:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1124
            self._transport.put(f, 'content of %s' % f)
1 by mbp at sourcefrog
import from baz patch-364
1125
1126
622 by Martin Pool
Updated merge patch from Aaron
1127
    def clone(self):
1128
        """
1129
        >>> orig = ScratchBranch(files=["file1", "file2"])
1130
        >>> clone = orig.clone()
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1131
        >>> if os.name != 'nt':
1132
        ...   os.path.samefile(orig.base, clone.base)
1133
        ... else:
1134
        ...   orig.base == clone.base
1135
        ...
622 by Martin Pool
Updated merge patch from Aaron
1136
        False
1137
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
1138
        True
1139
        """
800 by Martin Pool
Merge John's import-speedup branch:
1140
        from shutil import copytree
1141
        from tempfile import mkdtemp
1142
        base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1143
        os.rmdir(base)
800 by Martin Pool
Merge John's import-speedup branch:
1144
        copytree(self.base, base, symlinks=True)
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1145
        return ScratchBranch(
1146
            transport=bzrlib.transport.local.ScratchTransport(base))
1 by mbp at sourcefrog
import from baz patch-364
1147
    
1148
1149
######################################################################
1150
# predicates
1151
1152
1153
def is_control_file(filename):
1154
    ## FIXME: better check
1155
    filename = os.path.normpath(filename)
1156
    while filename != '':
1157
        head, tail = os.path.split(filename)
1158
        ## mutter('check %r for control file' % ((head, tail), ))
1159
        if tail == bzrlib.BZRDIR:
1160
            return True
70 by mbp at sourcefrog
Prepare for smart recursive add.
1161
        if filename == head:
1162
            break
1 by mbp at sourcefrog
import from baz patch-364
1163
        filename = head
1164
    return False