/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
490
    def fileid_involved_between_revs(self, from_revid, to_revid):
491
        """ This function returns the file_id(s) involved in the
1185.64.8 by Goffredo Baroncelli
small clean-up
492
            changes between the from_revid revision and the to_revid
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
493
            revision
494
        """
495
        raise NotImplementedError('fileid_involved_between_revs is abstract')
496
497
    def fileid_involved(self, last_revid=None):
498
        """ This function returns the file_id(s) involved in the
1185.64.8 by Goffredo Baroncelli
small clean-up
499
            changes up to the revision last_revid
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
500
            If no parametr is passed, then all file_id[s] present in the
501
            repository are returned
502
        """
503
        raise NotImplementedError('fileid_involved is abstract')
504
505
    def fileid_involved_by_set(self, changes):
506
        """ This function returns the file_id(s) involved in the
507
            changes present in the set 'changes'
508
        """
509
        raise NotImplementedError('fileid_involved_by_set is abstract')
510
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
511
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
512
    """A branch stored in the actual filesystem.
513
514
    Note that it's "local" in the context of the filesystem; it doesn't
515
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
516
    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,
517
518
    _lock_mode
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
519
        None, or 'r' or 'w'
520
521
    _lock_count
522
        If _lock_mode is true, a positive count of the number of times the
523
        lock has been taken.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
524
614 by Martin Pool
- unify two defintions of LockError
525
    _lock
526
        Lock object from bzrlib.lock.
1 by mbp at sourcefrog
import from baz patch-364
527
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
528
    # We actually expect this class to be somewhat short-lived; part of its
529
    # purpose is to try to isolate what bits of the branch logic are tied to
530
    # filesystem access, so that in a later step, we can extricate them to
531
    # a separarte ("storage") class.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
532
    _lock_mode = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
533
    _lock_count = None
615 by Martin Pool
Major rework of locking code:
534
    _lock = None
1223 by Martin Pool
- store inventories in weave
535
    _inventory_weave = None
353 by Martin Pool
- Per-branch locks in read and write modes.
536
    
897 by Martin Pool
- merge john's revision-naming code
537
    # Map some sort of prefix into a namespace
538
    # stuff like "revno:10", "revid:", etc.
539
    # This should match a prefix with a function which accepts
540
    REVISION_NAMESPACES = {}
541
1391 by Robert Collins
merge from integration
542
    def push_stores(self, branch_to):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
543
        """See Branch.push_stores."""
1391 by Robert Collins
merge from integration
544
        if (self._branch_format != branch_to._branch_format
545
            or self._branch_format != 4):
546
            from bzrlib.fetch import greedy_fetch
1393 by Robert Collins
reenable remotebranch tests
547
            mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
548
                   self, self._branch_format, branch_to, branch_to._branch_format)
1391 by Robert Collins
merge from integration
549
            greedy_fetch(to_branch=branch_to, from_branch=self,
550
                         revision=self.last_revision())
551
            return
552
553
        store_pairs = ((self.text_store,      branch_to.text_store),
554
                       (self.inventory_store, branch_to.inventory_store),
555
                       (self.revision_store,  branch_to.revision_store))
556
        try:
557
            for from_store, to_store in store_pairs: 
558
                copy_all(from_store, to_store)
559
        except UnlistableStore:
560
            raise UnlistableBranch(from_store)
561
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
562
    def __init__(self, transport, init=False,
1293 by Martin Pool
- add Branch constructor option to relax version check
563
                 relax_version_check=False):
1 by mbp at sourcefrog
import from baz patch-364
564
        """Create new branch object at a particular location.
565
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
566
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
567
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
568
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
569
             unversioned directory.  If False, the branch must already
570
             be versioned.
571
1293 by Martin Pool
- add Branch constructor option to relax version check
572
        relax_version_check -- If true, the usual check for the branch
573
            version is not applied.  This is intended only for
574
            upgrade/recovery type use; it's not guaranteed that
575
            all operations will work on old format branches.
576
1 by mbp at sourcefrog
import from baz patch-364
577
        In the test suite, creation of new trees is tested using the
578
        `ScratchBranch` class.
579
        """
1393.1.15 by Martin Pool
- better assertion message
580
        assert isinstance(transport, Transport), \
581
            "%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
582
        self._transport = transport
1 by mbp at sourcefrog
import from baz patch-364
583
        if init:
584
            self._make_control()
1293 by Martin Pool
- add Branch constructor option to relax version check
585
        self._check_format(relax_version_check)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
586
1429 by Robert Collins
merge in niemeyers prefixed-store patch
587
        def get_store(name, compressed=True, prefixed=False):
1393.1.41 by Martin Pool
doc
588
            # FIXME: This approach of assuming stores are all entirely compressed
589
            # or entirely uncompressed is tidy, but breaks upgrade from 
590
            # some existing branches where there's a mixture; we probably 
591
            # 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)
592
            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
593
            store = TextStore(self._transport.clone(relpath),
594
                              prefixed=prefixed,
595
                              compressed=compressed)
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
596
            #if self._transport.should_cache():
597
            #    cache_path = os.path.join(self.cache_root, name)
598
            #    os.mkdir(cache_path)
599
            #    store = bzrlib.store.CachedStore(store, cache_path)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
600
            return store
1185.33.87 by Martin Pool
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
601
1429 by Robert Collins
merge in niemeyers prefixed-store patch
602
        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)
603
            relpath = self._rel_controlfilename(unicode(name))
1429 by Robert Collins
merge in niemeyers prefixed-store patch
604
            ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
605
            if self._transport.should_cache():
606
                ws.enable_cache = True
607
            return ws
608
1296 by Martin Pool
- v4 branch should allow access to inventory and text stores
609
        if self._branch_format == 4:
1185.33.87 by Martin Pool
[patch] refactor code that make sure stores are opened with unicode filenames (robertc)
610
            self.inventory_store = get_store('inventory-store')
611
            self.text_store = get_store('text-store')
612
            self.revision_store = get_store('revision-store')
1390 by Robert Collins
pair programming worx... merge integration and weave
613
        elif self._branch_format == 5:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
614
            self.control_weaves = get_weave(u'')
615
            self.weave_store = get_weave(u'weaves')
616
            self.revision_store = get_store(u'revision-store', compressed=False)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
617
        elif self._branch_format == 6:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
618
            self.control_weaves = get_weave(u'')
619
            self.weave_store = get_weave(u'weaves', prefixed=True)
620
            self.revision_store = get_store(u'revision-store', compressed=False,
1429 by Robert Collins
merge in niemeyers prefixed-store patch
621
                                            prefixed=True)
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
622
        self.revision_store.register_suffix('sig')
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
623
        self._transaction = None
1 by mbp at sourcefrog
import from baz patch-364
624
625
    def __str__(self):
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
626
        return '%s(%r)' % (self.__class__.__name__, self._transport.base)
1 by mbp at sourcefrog
import from baz patch-364
627
628
    __repr__ = __str__
629
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
630
    def __del__(self):
615 by Martin Pool
Major rework of locking code:
631
        if self._lock_mode or self._lock:
1390 by Robert Collins
pair programming worx... merge integration and weave
632
            # XXX: This should show something every time, and be suitable for
633
            # headless operation and embedding
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
634
            warn("branch %r was not explicitly unlocked" % self)
615 by Martin Pool
Major rework of locking code:
635
            self._lock.unlock()
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
636
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
637
        # TODO: It might be best to do this somewhere else,
638
        # but it is nice for a Branch object to automatically
639
        # cache it's information.
640
        # Alternatively, we could have the Transport objects cache requests
641
        # See the earlier discussion about how major objects (like Branch)
642
        # should never expect their __del__ function to run.
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
643
        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.
644
            try:
645
                shutil.rmtree(self.cache_root)
646
            except:
647
                pass
648
            self.cache_root = None
649
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
650
    def _get_base(self):
907.1.19 by John Arbash Meinel
Updated ScratchBranch and Branch.base, All Tests PASS !!!
651
        if self._transport:
652
            return self._transport.base
653
        return None
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
654
1442.1.5 by Robert Collins
Give branch.base a docstring.
655
    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,
656
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
657
    def _finish_transaction(self):
658
        """Exit the current transaction."""
659
        if self._transaction is None:
660
            raise errors.LockError('Branch %s is not in a transaction' %
661
                                   self)
662
        transaction = self._transaction
663
        self._transaction = None
664
        transaction.finish()
665
666
    def get_transaction(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
667
        """See Branch.get_transaction."""
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
668
        if self._transaction is None:
669
            return transactions.PassThroughTransaction()
670
        else:
671
            return self._transaction
672
673
    def _set_transaction(self, new_transaction):
674
        """Set a new active transaction."""
675
        if self._transaction is not None:
676
            raise errors.LockError('Branch %s is in a transaction already.' %
677
                                   self)
678
        self._transaction = new_transaction
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
679
680
    def lock_write(self):
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
681
        #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.
682
        # TODO: Upgrade locking to support using a Transport,
683
        # and potentially a remote locking protocol
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
684
        if self._lock_mode:
685
            if self._lock_mode != 'w':
686
                raise LockError("can't upgrade to a write lock from %r" %
687
                                self._lock_mode)
688
            self._lock_count += 1
689
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
690
            self._lock = self._transport.lock_write(
691
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
692
            self._lock_mode = 'w'
693
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
694
            self._set_transaction(transactions.PassThroughTransaction())
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
695
696
    def lock_read(self):
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
697
        #mutter("lock read: %s (%s)", self, self._lock_count)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
698
        if self._lock_mode:
699
            assert self._lock_mode in ('r', 'w'), \
700
                   "invalid lock mode %r" % self._lock_mode
701
            self._lock_count += 1
702
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
703
            self._lock = self._transport.lock_read(
704
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
705
            self._lock_mode = 'r'
706
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
707
            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.
708
            # 5K may be excessive, but hey, its a knob.
709
            self.get_transaction().set_cache_size(5000)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
710
                        
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
711
    def unlock(self):
1185.50.6 by John Arbash Meinel
Fixed a broken test from my 'push updates local working tree' fix
712
        #mutter("unlock: %s (%s)", self, self._lock_count)
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
713
        if not self._lock_mode:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
714
            raise LockError('branch %r is not locked' % (self))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
715
716
        if self._lock_count > 1:
717
            self._lock_count -= 1
718
        else:
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
719
            self._finish_transaction()
615 by Martin Pool
Major rework of locking code:
720
            self._lock.unlock()
721
            self._lock = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
722
            self._lock_mode = self._lock_count = None
353 by Martin Pool
- Per-branch locks in read and write modes.
723
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
724
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
725
        """See Branch.abspath."""
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
726
        return self._transport.abspath(name)
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
727
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
728
    def _rel_controlfilename(self, file_or_path):
1469 by Robert Collins
Change Transport.* to work with URL's.
729
        if not isinstance(file_or_path, basestring):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
730
            file_or_path = u'/'.join(file_or_path)
1469 by Robert Collins
Change Transport.* to work with URL's.
731
        if file_or_path == '':
732
            return bzrlib.BZRDIR
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
733
        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.
734
1 by mbp at sourcefrog
import from baz patch-364
735
    def controlfilename(self, file_or_path):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
736
        """See Branch.controlfilename."""
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
737
        return self._transport.abspath(self._rel_controlfilename(file_or_path))
1 by mbp at sourcefrog
import from baz patch-364
738
739
    def controlfile(self, file_or_path, mode='r'):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
740
        """See Branch.controlfile."""
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
741
        import codecs
742
743
        relpath = self._rel_controlfilename(file_or_path)
744
        #TODO: codecs.open() buffers linewise, so it was overloaded with
745
        # a much larger buffer, do we need to do the same for getreader/getwriter?
746
        if mode == 'rb': 
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
747
            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.
748
        elif mode == 'wb':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
749
            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.
750
        elif mode == 'r':
1185.16.149 by Martin Pool
doc
751
            # XXX: Do we really want errors='replace'?   Perhaps it should be
752
            # an error, or at least reported, if there's incorrectly-encoded
753
            # data inside a file.
754
            # <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.
755
            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.
756
        elif mode == 'w':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
757
            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
758
        else:
759
            raise BzrError("invalid controlfile mode %r" % mode)
760
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
761
    def put_controlfile(self, path, f, encode=True):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
762
        """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.
763
        self.put_controlfiles([(path, f)], encode=encode)
764
765
    def put_controlfiles(self, files, encode=True):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
766
        """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.
767
        import codecs
768
        ctrl_files = []
769
        for path, f in files:
770
            if encode:
771
                if isinstance(f, basestring):
772
                    f = f.encode('utf-8', 'replace')
773
                else:
774
                    f = codecs.getwriter('utf-8')(f, errors='replace')
775
            path = self._rel_controlfilename(path)
776
            ctrl_files.append((path, f))
777
        self._transport.put_multi(ctrl_files)
1 by mbp at sourcefrog
import from baz patch-364
778
779
    def _make_control(self):
800 by Martin Pool
Merge John's import-speedup branch:
780
        from bzrlib.inventory import Inventory
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
781
        from bzrlib.weavefile import write_weave_v5
782
        from bzrlib.weave import Weave
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
783
        
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
784
        # 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
785
        sio = StringIO()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
786
        # if we want per-tree root ids then this is the place to set
787
        # them; they're not needed for now and so ommitted for
788
        # simplicity.
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
789
        bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
790
        empty_inv = sio.getvalue()
791
        sio = StringIO()
792
        bzrlib.weavefile.write_weave_v5(Weave(), sio)
793
        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
794
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
795
        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
796
        files = [('README', 
1 by mbp at sourcefrog
import from baz patch-364
797
            "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
798
            "Do not change any files in this directory.\n"),
1429 by Robert Collins
merge in niemeyers prefixed-store patch
799
            ('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
800
            ('revision-history', ''),
801
            ('branch-name', ''),
802
            ('branch-lock', ''),
803
            ('pending-merges', ''),
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
804
            ('inventory', empty_inv),
805
            ('inventory.weave', empty_weave),
806
            ('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
807
        ]
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
808
        cfn = self._rel_controlfilename
809
        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.
810
        self.put_controlfiles(files)
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
811
        mutter('created control directory in ' + self._transport.base)
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
812
1293 by Martin Pool
- add Branch constructor option to relax version check
813
    def _check_format(self, relax_version_check):
1 by mbp at sourcefrog
import from baz patch-364
814
        """Check this branch format is supported.
815
1187 by Martin Pool
- improved check for branch version
816
        The format level is stored, as an integer, in
817
        self._branch_format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
818
819
        In the future, we might need different in-memory Branch
820
        classes to support downlevel branches.  But not yet.
163 by mbp at sourcefrog
merge win32 portability fixes
821
        """
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
822
        try:
823
            fmt = self.controlfile('branch-format', 'r').read()
824
        except NoSuchFile:
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
825
            raise NotBranchError(path=self.base)
1393.1.63 by Martin Pool
- add some trace statements
826
        mutter("got branch format %r", fmt)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
827
        if fmt == BZR_BRANCH_FORMAT_6:
828
            self._branch_format = 6
829
        elif fmt == BZR_BRANCH_FORMAT_5:
1187 by Martin Pool
- improved check for branch version
830
            self._branch_format = 5
1294 by Martin Pool
- refactor branch version detection
831
        elif fmt == BZR_BRANCH_FORMAT_4:
832
            self._branch_format = 4
833
834
        if (not relax_version_check
1429 by Robert Collins
merge in niemeyers prefixed-store patch
835
            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
836
            raise errors.UnsupportedFormatError(
837
                           'sorry, branch format %r not supported' % fmt,
576 by Martin Pool
- raise exceptions rather than using bailout()
838
                           ['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.
839
                            'or remove the .bzr directory'
840
                            ' and "bzr init" again'])
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
841
1508.1.15 by Robert Collins
Merge from mpool.
842
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
843
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
844
        """See Branch.get_root_id."""
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
845
        inv = self.get_inventory(self.last_revision())
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
846
        return inv.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
847
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
848
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
849
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
850
        """See Branch.print_file."""
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
851
        tree = self.revision_tree(revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
852
        # use inventory as it was in that revision
853
        file_id = tree.inventory.path2id(file)
854
        if not file_id:
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
855
            try:
856
                revno = self.revision_id_to_revno(revision_id)
857
            except errors.NoSuchRevision:
858
                # TODO: This should not be BzrError,
859
                # but NoSuchFile doesn't fit either
860
                raise BzrError('%r is not present in revision %s' 
861
                                % (file, revision_id))
862
            else:
863
                raise BzrError('%r is not present in revision %s'
864
                                % (file, revno))
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
865
        tree.print_file(file_id)
866
867
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
868
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
869
        """See Branch.append_revision."""
905 by Martin Pool
- merge aaron's append_multiple.patch
870
        for revision_id in revision_ids:
871
            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.
872
        rev_history = self.revision_history()
873
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
874
        self.set_revision_history(rev_history)
875
876
    @needs_write_lock
877
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
878
        """See Branch.set_revision_history."""
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
879
        old_revision = self.last_revision()
880
        new_revision = rev_history[-1]
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
881
        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.
882
        try:
883
            self.working_tree().set_last_revision(new_revision, old_revision)
884
        except NoWorkingTree:
885
            mutter('Unable to set_last_revision without a working tree.')
233 by mbp at sourcefrog
- more output from test.sh
886
1261 by Martin Pool
- new method Branch.has_revision
887
    def has_revision(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
888
        """See Branch.has_revision."""
1390 by Robert Collins
pair programming worx... merge integration and weave
889
        return (revision_id is None
1442.1.45 by Robert Collins
replace __contains__ calls in stores with has_id
890
                or self.revision_store.has_id(revision_id))
1261 by Martin Pool
- new method Branch.has_revision
891
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
892
    @needs_read_lock
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
893
    def _get_revision_xml_file(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
894
        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.
895
            raise InvalidRevisionId(revision_id=revision_id, branch=self)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
896
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
897
            return self.revision_store.get(revision_id)
898
        except (IndexError, KeyError):
899
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
900
1231 by Martin Pool
- more progress on fetch on top of weaves
901
    def get_revision_xml(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
902
        """See Branch.get_revision_xml."""
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
903
        return self._get_revision_xml_file(revision_id).read()
1231 by Martin Pool
- more progress on fetch on top of weaves
904
1 by mbp at sourcefrog
import from baz patch-364
905
    def get_revision(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
906
        """See Branch.get_revision."""
1185.42.5 by Jelmer Vernooij
Make get_revision_xml_file() private
907
        xml_file = self._get_revision_xml_file(revision_id)
1027 by Martin Pool
- better error message when failing to get revision from store
908
909
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
910
            r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
911
        except SyntaxError, e:
912
            raise bzrlib.errors.BzrError('failed to unpack revision_xml',
913
                                         [revision_id,
914
                                          str(e)])
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
915
            
1 by mbp at sourcefrog
import from baz patch-364
916
        assert r.revision_id == revision_id
917
        return r
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
918
672 by Martin Pool
- revision records include the hash of their inventory and
919
    def get_revision_sha1(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
920
        """See Branch.get_revision_sha1."""
672 by Martin Pool
- revision records include the hash of their inventory and
921
        # In the future, revision entries will be signed. At that
922
        # point, it is probably best *not* to include the signature
923
        # in the revision hash. Because that lets you re-sign
924
        # the revision, (add signatures/remove signatures) and still
925
        # have all hash pointers stay consistent.
926
        # But for now, just hash the contents.
1230 by Martin Pool
- remove Branch.get_revision_xml; use get_revision_xml_file instead
927
        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
928
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
929
    def get_ancestry(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
930
        """See Branch.get_ancestry."""
1390 by Robert Collins
pair programming worx... merge integration and weave
931
        if revision_id is None:
932
            return [None]
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
933
        w = self._get_inventory_weave()
1415 by Robert Collins
remove the ancestry weave file
934
        return [None] + map(w.idx_to_name,
935
                            w.inclusions([w.lookup(revision_id)]))
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
936
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
937
    def _get_inventory_weave(self):
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
938
        return self.control_weaves.get_weave('inventory',
939
                                             self.get_transaction())
1223 by Martin Pool
- store inventories in weave
940
1192 by Martin Pool
- clean up code for retrieving stored inventories
941
    def get_inventory(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
942
        """See Branch.get_inventory."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
943
        xml = self.get_inventory_xml(revision_id)
944
        return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
945
1192 by Martin Pool
- clean up code for retrieving stored inventories
946
    def get_inventory_xml(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
947
        """See Branch.get_inventory_xml."""
1192 by Martin Pool
- clean up code for retrieving stored inventories
948
        try:
949
            assert isinstance(revision_id, basestring), type(revision_id)
1495.1.3 by Jelmer Vernooij
Move some more generic methods from NativeBranch to Branch.
950
            iw = self._get_inventory_weave()
1223 by Martin Pool
- store inventories in weave
951
            return iw.get_text(iw.lookup(revision_id))
1192 by Martin Pool
- clean up code for retrieving stored inventories
952
        except IndexError:
953
            raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
954
1192 by Martin Pool
- clean up code for retrieving stored inventories
955
    def get_inventory_sha1(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
956
        """See Branch.get_inventory_sha1."""
1223 by Martin Pool
- store inventories in weave
957
        return self.get_revision(revision_id).inventory_sha1
672 by Martin Pool
- revision records include the hash of their inventory and
958
1 by mbp at sourcefrog
import from baz patch-364
959
    def get_revision_inventory(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
960
        """See Branch.get_revision_inventory."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
961
        # TODO: Unify this with get_inventory()
1218 by Martin Pool
- fix up import
962
        # 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
963
        # must be the same as its revision, so this is trivial.
1 by mbp at sourcefrog
import from baz patch-364
964
        if revision_id == None:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
965
            # This does not make sense: if there is no revision,
966
            # then it is the current tree inventory surely ?!
967
            # and thus get_root_id() is something that looks at the last
968
            # commit on the branch, and the get_root_id is an inventory check.
969
            raise NotImplementedError
970
            # return Inventory(self.get_root_id())
1 by mbp at sourcefrog
import from baz patch-364
971
        else:
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
972
            return self.get_inventory(revision_id)
1 by mbp at sourcefrog
import from baz patch-364
973
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
974
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
975
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
976
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
977
        transaction = self.get_transaction()
978
        history = transaction.map.find_revision_history()
979
        if history is not None:
980
            mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
981
            return list(history)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
982
        history = [l.rstrip('\r\n') for l in
983
                self.controlfile('revision-history', 'r').readlines()]
984
        transaction.map.add_revision_history(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_clean(history, precious=True)
988
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
989
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
990
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
991
        """See Branch.update_revisions."""
974.1.33 by aaron.bentley at utoronto
Added greedy_fetch to update_revisions
992
        from bzrlib.fetch import greedy_fetch
974.1.75 by Aaron Bentley
Sped up pull by copying locally first
993
        if stop_revision is None:
1390 by Robert Collins
pair programming worx... merge integration and weave
994
            stop_revision = other.last_revision()
1185.12.44 by abentley
Restored branch convergence to bzr pull
995
        ### 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
996
        if (stop_revision is not None and 
997
            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
998
            return
1260 by Martin Pool
- some updates for fetch/update function
999
        greedy_fetch(to_branch=self, from_branch=other,
1261 by Martin Pool
- new method Branch.has_revision
1000
                     revision=stop_revision)
1185.12.44 by abentley
Restored branch convergence to bzr pull
1001
        pullable_revs = self.pullable_revisions(other, stop_revision)
1185.12.45 by abentley
Cleanups for pull
1002
        if len(pullable_revs) > 0:
1261 by Martin Pool
- new method Branch.has_revision
1003
            self.append_revision(*pullable_revs)
1185.12.44 by abentley
Restored branch convergence to bzr pull
1004
1005
    def pullable_revisions(self, other, stop_revision):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1006
        """See Branch.pullable_revisions."""
1185.12.44 by abentley
Restored branch convergence to bzr pull
1007
        other_revno = other.revision_id_to_revno(stop_revision)
1008
        try:
1009
            return self.missing_revisions(other, other_revno)
1010
        except DivergedBranches, e:
1011
            try:
1012
                pullable_revs = get_intervening_revisions(self.last_revision(),
1013
                                                          stop_revision, self)
1014
                assert self.last_revision() not in pullable_revs
1015
                return pullable_revs
1016
            except bzrlib.errors.NotAncestor:
1017
                if is_ancestor(self.last_revision(), stop_revision, self):
1018
                    return []
1019
                else:
1020
                    raise e
1021
        
1 by mbp at sourcefrog
import from baz patch-364
1022
    def revision_tree(self, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1023
        """See Branch.revision_tree."""
529 by Martin Pool
todo
1024
        # TODO: refactor this to use an existing revision object
1025
        # so we don't need to read it in twice.
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
1026
        if revision_id == None or revision_id == NULL_REVISION:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1027
            return EmptyTree()
1 by mbp at sourcefrog
import from baz patch-364
1028
        else:
1029
            inv = self.get_revision_inventory(revision_id)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
1030
            return RevisionTree(self.weave_store, inv, revision_id)
1 by mbp at sourcefrog
import from baz patch-364
1031
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1032
    def basis_tree(self):
1033
        """See Branch.basis_tree."""
1034
        try:
1035
            revision_id = self.revision_history()[-1]
1036
            xml = self.working_tree().read_basis_inventory(revision_id)
1037
            inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
1038
            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.
1039
        except (IndexError, NoSuchFile, NoWorkingTree), e:
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1040
            return self.revision_tree(self.last_revision())
1041
1 by mbp at sourcefrog
import from baz patch-364
1042
    def working_tree(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1043
        """See Branch.working_tree."""
1185.2.2 by Lalo Martins
cleaning up and refactoring the branch module.
1044
        from bzrlib.workingtree import WorkingTree
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1045
        if self._transport.base.find('://') != -1:
1046
            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.
1047
        return WorkingTree(self.base, branch=self)
1 by mbp at sourcefrog
import from baz patch-364
1048
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1049
    @needs_write_lock
1050
    def pull(self, source, overwrite=False):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1051
        """See Branch.pull."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1052
        source.lock_read()
1053
        try:
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1054
            old_count = len(self.revision_history())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1055
            try:
1056
                self.update_revisions(source)
1057
            except DivergedBranches:
1058
                if not overwrite:
1059
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1060
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1061
                self.set_revision_history(source.revision_history())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1062
            new_count = len(self.revision_history())
1063
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1064
        finally:
1065
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1066
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1067
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1068
        """See Branch.get_parent."""
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1069
        import errno
1070
        _locs = ['parent', 'pull', 'x-pull']
1071
        for l in _locs:
1072
            try:
1073
                return self.controlfile(l, 'r').read().strip('\n')
1185.50.11 by John Arbash Meinel
[merge] Refactor NoSuchFile style exceptions.
1074
            except NoSuchFile:
1075
                pass
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1076
        return None
1077
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1078
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1079
        """See Branch.get_push_location."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1080
        config = bzrlib.config.BranchConfig(self)
1081
        push_loc = config.get_user_option('push_location')
1082
        return push_loc
1083
1084
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1085
        """See Branch.set_push_location."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1086
        config = bzrlib.config.LocationConfig(self.base)
1087
        config.set_user_option('push_location', location)
1088
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1089
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1090
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1091
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1092
        # TODO: Maybe delete old location files?
1093
        from bzrlib.atomicfile import AtomicFile
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1094
        f = AtomicFile(self.controlfilename('parent'))
1150 by Martin Pool
- add new Branch.set_parent and tests
1095
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1096
            f.write(url + '\n')
1097
            f.commit()
1150 by Martin Pool
- add new Branch.set_parent and tests
1098
        finally:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1099
            f.close()
1150 by Martin Pool
- add new Branch.set_parent and tests
1100
1185.35.11 by Aaron Bentley
Added support for branch nicks
1101
    def tree_config(self):
1102
        return TreeConfig(self)
1103
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1104
    def sign_revision(self, revision_id, gpg_strategy):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1105
        """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.
1106
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
1107
        self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1108
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1109
    @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.
1110
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1111
        """See Branch.store_revision_signature."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1112
        self.revision_store.add(StringIO(gpg_strategy.sign(plaintext)), 
1113
                                revision_id, "sig")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1114
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1115
    def fileid_involved_between_revs(self, from_revid, to_revid):
1116
        """ This function returns the file_id(s) involved in the
1185.64.8 by Goffredo Baroncelli
small clean-up
1117
            changes between the from_revid revision and the to_revid
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1118
            revision
1119
        """
1120
        w = self._get_inventory_weave( )
1121
        from_set = set(w.inclusions([w.lookup(from_revid)]))
1122
        to_set = set(w.inclusions([w.lookup(to_revid)]))
1185.64.7 by Goffredo Baroncelli
added test for function fileid_involved
1123
        included = to_set.difference(from_set)
1124
        changed = map(w.idx_to_name,included)
1125
        return self._fileid_involved_by_set(changed)
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1126
1127
    def fileid_involved(self, last_revid=None):
1128
        """ This function returns the file_id(s) involved in the
1185.64.8 by Goffredo Baroncelli
small clean-up
1129
            changes up to the revision last_revid
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1130
            If no parametr is passed, then all file_id[s] present in the
1131
            repository are returned
1132
        """
1133
        w = self._get_inventory_weave( )
1134
        if not last_revid:
1185.64.7 by Goffredo Baroncelli
added test for function fileid_involved
1135
            changed = set(w._names)
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1136
        else:
1185.64.7 by Goffredo Baroncelli
added test for function fileid_involved
1137
            included = w.inclusions([w.lookup(last_revid)])
1138
            changed = map(w.idx_to_name, included)
1139
        return self._fileid_involved_by_set(changed)
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1140
1141
    def fileid_involved_by_set(self, changes):
1142
        """ This function returns the file_id(s) involved in the
1143
            changese present in the set changes
1144
        """
1145
        w = self._get_inventory_weave( )
1185.64.7 by Goffredo Baroncelli
added test for function fileid_involved
1146
        return self._fileid_involved_by_set(changes)
1147
1148
    def _fileid_involved_by_set(self, changes):
1149
        w = self._get_inventory_weave( )
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1150
        file_ids = set( )
1185.64.7 by Goffredo Baroncelli
added test for function fileid_involved
1151
        for line in w._weave:
1152
1153
            # it is ugly, but it is due to the weave structure
1154
            if not isinstance(line,basestring): continue
1155
1156
            start = line.find('file_id="')+9
1157
            if start < 9: continue
1158
            end = line.find('"',start)
1159
            assert end>= 0
1160
            file_id = line[start:end]
1161
1162
            # check if file_id is already present
1163
            if file_id in file_ids: continue
1164
1165
            start = line.find('revision="')+10
1166
            if start < 10: continue
1167
            end = line.find('"',start)
1168
            assert end>= 0
1169
            revision_id = line[start:end]
1170
1171
            if revision_id in changes:
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1172
                file_ids.add(file_id)
1173
1174
        return file_ids
1185.64.1 by Goffredo Baroncelli
function file_involved added
1175
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1176
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1177
class ScratchBranch(BzrBranch):
1 by mbp at sourcefrog
import from baz patch-364
1178
    """Special test class: a branch that cleans up after itself.
1179
1180
    >>> b = ScratchBranch()
1181
    >>> isdir(b.base)
1182
    True
1183
    >>> bd = b.base
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1184
    >>> b._transport.__del__()
1 by mbp at sourcefrog
import from baz patch-364
1185
    >>> isdir(bd)
1186
    False
1187
    """
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1188
1189
    def __init__(self, files=[], dirs=[], transport=None):
1 by mbp at sourcefrog
import from baz patch-364
1190
        """Make a test branch.
1191
1192
        This creates a temporary directory and runs init-tree in it.
1193
1194
        If any files are listed, they are created in the working copy.
1195
        """
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1196
        if transport is None:
1197
            transport = bzrlib.transport.local.ScratchTransport()
1198
            super(ScratchBranch, self).__init__(transport, init=True)
1199
        else:
1200
            super(ScratchBranch, self).__init__(transport)
1201
100 by mbp at sourcefrog
- add test case for ignore files
1202
        for d in dirs:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1203
            self._transport.mkdir(d)
100 by mbp at sourcefrog
- add test case for ignore files
1204
            
1 by mbp at sourcefrog
import from baz patch-364
1205
        for f in files:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1206
            self._transport.put(f, 'content of %s' % f)
1 by mbp at sourcefrog
import from baz patch-364
1207
1208
622 by Martin Pool
Updated merge patch from Aaron
1209
    def clone(self):
1210
        """
1211
        >>> orig = ScratchBranch(files=["file1", "file2"])
1212
        >>> clone = orig.clone()
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1213
        >>> if os.name != 'nt':
1214
        ...   os.path.samefile(orig.base, clone.base)
1215
        ... else:
1216
        ...   orig.base == clone.base
1217
        ...
622 by Martin Pool
Updated merge patch from Aaron
1218
        False
1219
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
1220
        True
1221
        """
800 by Martin Pool
Merge John's import-speedup branch:
1222
        from shutil import copytree
1223
        from tempfile import mkdtemp
1224
        base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1225
        os.rmdir(base)
800 by Martin Pool
Merge John's import-speedup branch:
1226
        copytree(self.base, base, symlinks=True)
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1227
        return ScratchBranch(
1228
            transport=bzrlib.transport.local.ScratchTransport(base))
1 by mbp at sourcefrog
import from baz patch-364
1229
    
1230
1231
######################################################################
1232
# predicates
1233
1234
1235
def is_control_file(filename):
1236
    ## FIXME: better check
1237
    filename = os.path.normpath(filename)
1238
    while filename != '':
1239
        head, tail = os.path.split(filename)
1240
        ## mutter('check %r for control file' % ((head, tail), ))
1241
        if tail == bzrlib.BZRDIR:
1242
            return True
70 by mbp at sourcefrog
Prepare for smart recursive add.
1243
        if filename == head:
1244
            break
1 by mbp at sourcefrog
import from baz patch-364
1245
        filename = head
1246
    return False