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