/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
70 by mbp at sourcefrog
Prepare for smart recursive add.
1
# Copyright (C) 2005 Canonical Ltd
2
1 by mbp at sourcefrog
import from baz patch-364
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
18
import shutil
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
19
import sys
20
import os
1371 by Martin Pool
- raise NotBranchError if format file can't be read
21
import errno
1372 by Martin Pool
- avoid converting inventories to/from StringIO
22
from warnings import warn
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
23
from cStringIO import StringIO
1372 by Martin Pool
- avoid converting inventories to/from StringIO
24
1 by mbp at sourcefrog
import from baz patch-364
25
26
import bzrlib
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
27
from bzrlib.inventory import InventoryEntry
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
1390 by Robert Collins
pair programming worx... merge integration and weave
30
from bzrlib.osutils import (isdir, quotefn, compact_date, rand_bytes, 
31
                            rename, splitpath, sha_file, appendpath, 
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
32
                            file_kind, abspath)
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
47
from bzrlib.store.compressed_text import CompressedTextStore
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
48
from bzrlib.store.text import TextStore
1393.2.3 by John Arbash Meinel
Fixing typos, updating stores, getting tests to pass.
49
from bzrlib.store.weave import WeaveStore
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
50
from bzrlib.testament import Testament
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
51
import bzrlib.transactions as transactions
1393.2.4 by John Arbash Meinel
All tests pass.
52
from bzrlib.transport import Transport, get_transport
1189 by Martin Pool
- BROKEN: partial support for commit into weave
53
import bzrlib.xml5
1104 by Martin Pool
- Add a simple UIFactory
54
import bzrlib.ui
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."""
1393.1.16 by Martin Pool
- fix up Branch.open_downlevel for Transport
114
        return _Branch(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)
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
121
        return _Branch(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:
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
136
                return _Branch(t), t.relpath(url)
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
137
            except NotBranchError:
138
                pass
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)
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
149
        return _Branch(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
157
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
158
class _Branch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
159
    """A branch stored in the actual filesystem.
160
161
    Note that it's "local" in the context of the filesystem; it doesn't
162
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
163
    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,
164
165
    _lock_mode
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
166
        None, or 'r' or 'w'
167
168
    _lock_count
169
        If _lock_mode is true, a positive count of the number of times the
170
        lock has been taken.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
171
614 by Martin Pool
- unify two defintions of LockError
172
    _lock
173
        Lock object from bzrlib.lock.
1 by mbp at sourcefrog
import from baz patch-364
174
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
175
    # We actually expect this class to be somewhat short-lived; part of its
176
    # purpose is to try to isolate what bits of the branch logic are tied to
177
    # filesystem access, so that in a later step, we can extricate them to
178
    # a separarte ("storage") class.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
179
    _lock_mode = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
180
    _lock_count = None
615 by Martin Pool
Major rework of locking code:
181
    _lock = None
1223 by Martin Pool
- store inventories in weave
182
    _inventory_weave = None
353 by Martin Pool
- Per-branch locks in read and write modes.
183
    
897 by Martin Pool
- merge john's revision-naming code
184
    # Map some sort of prefix into a namespace
185
    # stuff like "revno:10", "revid:", etc.
186
    # This should match a prefix with a function which accepts
187
    REVISION_NAMESPACES = {}
188
1391 by Robert Collins
merge from integration
189
    def push_stores(self, branch_to):
190
        """Copy the content of this branches store to branch_to."""
191
        if (self._branch_format != branch_to._branch_format
192
            or self._branch_format != 4):
193
            from bzrlib.fetch import greedy_fetch
1393 by Robert Collins
reenable remotebranch tests
194
            mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
195
                   self, self._branch_format, branch_to, branch_to._branch_format)
1391 by Robert Collins
merge from integration
196
            greedy_fetch(to_branch=branch_to, from_branch=self,
197
                         revision=self.last_revision())
198
            return
199
200
        store_pairs = ((self.text_store,      branch_to.text_store),
201
                       (self.inventory_store, branch_to.inventory_store),
202
                       (self.revision_store,  branch_to.revision_store))
203
        try:
204
            for from_store, to_store in store_pairs: 
205
                copy_all(from_store, to_store)
206
        except UnlistableStore:
207
            raise UnlistableBranch(from_store)
208
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
209
    def __init__(self, transport, init=False,
1293 by Martin Pool
- add Branch constructor option to relax version check
210
                 relax_version_check=False):
1 by mbp at sourcefrog
import from baz patch-364
211
        """Create new branch object at a particular location.
212
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
213
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
214
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
215
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
216
             unversioned directory.  If False, the branch must already
217
             be versioned.
218
1293 by Martin Pool
- add Branch constructor option to relax version check
219
        relax_version_check -- If true, the usual check for the branch
220
            version is not applied.  This is intended only for
221
            upgrade/recovery type use; it's not guaranteed that
222
            all operations will work on old format branches.
223
1 by mbp at sourcefrog
import from baz patch-364
224
        In the test suite, creation of new trees is tested using the
225
        `ScratchBranch` class.
226
        """
1393.1.15 by Martin Pool
- better assertion message
227
        assert isinstance(transport, Transport), \
228
            "%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
229
        self._transport = transport
1 by mbp at sourcefrog
import from baz patch-364
230
        if init:
231
            self._make_control()
1293 by Martin Pool
- add Branch constructor option to relax version check
232
        self._check_format(relax_version_check)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
233
1429 by Robert Collins
merge in niemeyers prefixed-store patch
234
        def get_store(name, compressed=True, prefixed=False):
1393.1.41 by Martin Pool
doc
235
            # FIXME: This approach of assuming stores are all entirely compressed
236
            # or entirely uncompressed is tidy, but breaks upgrade from 
237
            # some existing branches where there's a mixture; we probably 
238
            # still want the option to look for both.
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
239
            relpath = self._rel_controlfilename(name)
240
            if compressed:
1429 by Robert Collins
merge in niemeyers prefixed-store patch
241
                store = CompressedTextStore(self._transport.clone(relpath),
242
                                            prefixed=prefixed)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
243
            else:
1429 by Robert Collins
merge in niemeyers prefixed-store patch
244
                store = TextStore(self._transport.clone(relpath),
245
                                  prefixed=prefixed)
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
246
            #if self._transport.should_cache():
247
            #    cache_path = os.path.join(self.cache_root, name)
248
            #    os.mkdir(cache_path)
249
            #    store = bzrlib.store.CachedStore(store, cache_path)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
250
            return store
1429 by Robert Collins
merge in niemeyers prefixed-store patch
251
        def get_weave(name, prefixed=False):
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
252
            relpath = self._rel_controlfilename(name)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
253
            ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
254
            if self._transport.should_cache():
255
                ws.enable_cache = True
256
            return ws
257
1296 by Martin Pool
- v4 branch should allow access to inventory and text stores
258
        if self._branch_format == 4:
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
259
            self.inventory_store = get_store('inventory-store')
260
            self.text_store = get_store('text-store')
261
            self.revision_store = get_store('revision-store')
1390 by Robert Collins
pair programming worx... merge integration and weave
262
        elif self._branch_format == 5:
1469 by Robert Collins
Change Transport.* to work with URL's.
263
            self.control_weaves = get_weave('')
1393.2.3 by John Arbash Meinel
Fixing typos, updating stores, getting tests to pass.
264
            self.weave_store = get_weave('weaves')
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
265
            self.revision_store = get_store('revision-store', compressed=False)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
266
        elif self._branch_format == 6:
1469 by Robert Collins
Change Transport.* to work with URL's.
267
            self.control_weaves = get_weave('')
1429 by Robert Collins
merge in niemeyers prefixed-store patch
268
            self.weave_store = get_weave('weaves', prefixed=True)
269
            self.revision_store = get_store('revision-store', compressed=False,
270
                                            prefixed=True)
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
271
        self.revision_store.register_suffix('sig')
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
272
        self._transaction = None
1 by mbp at sourcefrog
import from baz patch-364
273
274
    def __str__(self):
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
275
        return '%s(%r)' % (self.__class__.__name__, self._transport.base)
1 by mbp at sourcefrog
import from baz patch-364
276
277
    __repr__ = __str__
278
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
279
    def __del__(self):
615 by Martin Pool
Major rework of locking code:
280
        if self._lock_mode or self._lock:
1390 by Robert Collins
pair programming worx... merge integration and weave
281
            # XXX: This should show something every time, and be suitable for
282
            # headless operation and embedding
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
283
            warn("branch %r was not explicitly unlocked" % self)
615 by Martin Pool
Major rework of locking code:
284
            self._lock.unlock()
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
285
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
286
        # TODO: It might be best to do this somewhere else,
287
        # but it is nice for a Branch object to automatically
288
        # cache it's information.
289
        # Alternatively, we could have the Transport objects cache requests
290
        # See the earlier discussion about how major objects (like Branch)
291
        # should never expect their __del__ function to run.
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
292
        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.
293
            try:
294
                shutil.rmtree(self.cache_root)
295
            except:
296
                pass
297
            self.cache_root = None
298
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
299
    def _get_base(self):
907.1.19 by John Arbash Meinel
Updated ScratchBranch and Branch.base, All Tests PASS !!!
300
        if self._transport:
301
            return self._transport.base
302
        return None
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
303
1442.1.5 by Robert Collins
Give branch.base a docstring.
304
    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,
305
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
306
    def _finish_transaction(self):
307
        """Exit the current transaction."""
308
        if self._transaction is None:
309
            raise errors.LockError('Branch %s is not in a transaction' %
310
                                   self)
311
        transaction = self._transaction
312
        self._transaction = None
313
        transaction.finish()
314
315
    def get_transaction(self):
316
        """Return the current active transaction.
317
318
        If no transaction is active, this returns a passthrough object
1185.21.1 by Jelmer Vernooij
Fix typo
319
        for which all data is immediately flushed and no caching happens.
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
320
        """
321
        if self._transaction is None:
322
            return transactions.PassThroughTransaction()
323
        else:
324
            return self._transaction
325
326
    def _set_transaction(self, new_transaction):
327
        """Set a new active transaction."""
328
        if self._transaction is not None:
329
            raise errors.LockError('Branch %s is in a transaction already.' %
330
                                   self)
331
        self._transaction = new_transaction
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
332
333
    def lock_write(self):
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
334
        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.
335
        # TODO: Upgrade locking to support using a Transport,
336
        # and potentially a remote locking protocol
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
337
        if self._lock_mode:
338
            if self._lock_mode != 'w':
339
                raise LockError("can't upgrade to a write lock from %r" %
340
                                self._lock_mode)
341
            self._lock_count += 1
342
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
343
            self._lock = self._transport.lock_write(
344
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
345
            self._lock_mode = 'w'
346
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
347
            self._set_transaction(transactions.PassThroughTransaction())
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
348
349
    def lock_read(self):
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
350
        mutter("lock read: %s (%s)", self, self._lock_count)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
351
        if self._lock_mode:
352
            assert self._lock_mode in ('r', 'w'), \
353
                   "invalid lock mode %r" % self._lock_mode
354
            self._lock_count += 1
355
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
356
            self._lock = self._transport.lock_read(
357
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
358
            self._lock_mode = 'r'
359
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
360
            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.
361
            # 5K may be excessive, but hey, its a knob.
362
            self.get_transaction().set_cache_size(5000)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
363
                        
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
364
    def unlock(self):
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
365
        mutter("unlock: %s (%s)", self, self._lock_count)
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
366
        if not self._lock_mode:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
367
            raise LockError('branch %r is not locked' % (self))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
368
369
        if self._lock_count > 1:
370
            self._lock_count -= 1
371
        else:
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
372
            self._finish_transaction()
615 by Martin Pool
Major rework of locking code:
373
            self._lock.unlock()
374
            self._lock = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
375
            self._lock_mode = self._lock_count = None
353 by Martin Pool
- Per-branch locks in read and write modes.
376
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
377
    def abspath(self, name):
1457.1.2 by Robert Collins
move branch._relpath into osutils as relpath
378
        """Return absolute filename for something in the branch
379
        
380
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
381
        method and not a tree method.
382
        """
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
383
        return self._transport.abspath(name)
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
384
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
385
    def _rel_controlfilename(self, file_or_path):
1469 by Robert Collins
Change Transport.* to work with URL's.
386
        if not isinstance(file_or_path, basestring):
387
            file_or_path = '/'.join(file_or_path)
388
        if file_or_path == '':
389
            return bzrlib.BZRDIR
390
        return bzrlib.transport.urlescape(bzrlib.BZRDIR + '/' + file_or_path)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
391
1 by mbp at sourcefrog
import from baz patch-364
392
    def controlfilename(self, file_or_path):
393
        """Return location relative to branch."""
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
394
        return self._transport.abspath(self._rel_controlfilename(file_or_path))
1 by mbp at sourcefrog
import from baz patch-364
395
396
    def controlfile(self, file_or_path, mode='r'):
245 by mbp at sourcefrog
- control files always in utf-8-unix format
397
        """Open a control file for this branch.
398
399
        There are two classes of file in the control directory: text
400
        and binary.  binary files are untranslated byte streams.  Text
401
        control files are stored with Unix newlines and in UTF-8, even
402
        if the platform or locale defaults are different.
430 by Martin Pool
doc
403
404
        Controlfiles should almost never be opened in write mode but
405
        rather should be atomically copied and replaced using atomicfile.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
406
        """
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
407
        import codecs
408
409
        relpath = self._rel_controlfilename(file_or_path)
410
        #TODO: codecs.open() buffers linewise, so it was overloaded with
411
        # a much larger buffer, do we need to do the same for getreader/getwriter?
412
        if mode == 'rb': 
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
413
            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.
414
        elif mode == 'wb':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
415
            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.
416
        elif mode == 'r':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
417
            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.
418
        elif mode == 'w':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
419
            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
420
        else:
421
            raise BzrError("invalid controlfile mode %r" % mode)
422
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
423
    def put_controlfile(self, path, f, encode=True):
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
424
        """Write an entry as a controlfile.
425
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
426
        :param path: The path to put the file, relative to the .bzr control
427
                     directory
428
        :param f: A file-like or string object whose contents should be copied.
429
        :param encode:  If true, encode the contents as utf-8
430
        """
431
        self.put_controlfiles([(path, f)], encode=encode)
432
433
    def put_controlfiles(self, files, encode=True):
434
        """Write several entries as controlfiles.
435
436
        :param files: A list of [(path, file)] pairs, where the path is the directory
437
                      underneath the bzr control directory
438
        :param encode:  If true, encode the contents as utf-8
439
        """
440
        import codecs
441
        ctrl_files = []
442
        for path, f in files:
443
            if encode:
444
                if isinstance(f, basestring):
445
                    f = f.encode('utf-8', 'replace')
446
                else:
447
                    f = codecs.getwriter('utf-8')(f, errors='replace')
448
            path = self._rel_controlfilename(path)
449
            ctrl_files.append((path, f))
450
        self._transport.put_multi(ctrl_files)
1 by mbp at sourcefrog
import from baz patch-364
451
452
    def _make_control(self):
800 by Martin Pool
Merge John's import-speedup branch:
453
        from bzrlib.inventory import Inventory
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
454
        from bzrlib.weavefile import write_weave_v5
455
        from bzrlib.weave import Weave
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
456
        
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
457
        # 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
458
        sio = StringIO()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
459
        # if we want per-tree root ids then this is the place to set
460
        # them; they're not needed for now and so ommitted for
461
        # simplicity.
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
462
        bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
463
        empty_inv = sio.getvalue()
464
        sio = StringIO()
465
        bzrlib.weavefile.write_weave_v5(Weave(), sio)
466
        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
467
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
468
        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
469
        files = [('README', 
1 by mbp at sourcefrog
import from baz patch-364
470
            "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
471
            "Do not change any files in this directory.\n"),
1429 by Robert Collins
merge in niemeyers prefixed-store patch
472
            ('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
473
            ('revision-history', ''),
474
            ('branch-name', ''),
475
            ('branch-lock', ''),
476
            ('pending-merges', ''),
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
477
            ('inventory', empty_inv),
478
            ('inventory.weave', empty_weave),
479
            ('ancestry.weave', empty_weave)
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
480
        ]
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
481
        cfn = self._rel_controlfilename
482
        self._transport.mkdir_multi([cfn(d) for d in dirs])
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
483
        self.put_controlfiles(files)
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
484
        mutter('created control directory in ' + self._transport.base)
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
485
1293 by Martin Pool
- add Branch constructor option to relax version check
486
    def _check_format(self, relax_version_check):
1 by mbp at sourcefrog
import from baz patch-364
487
        """Check this branch format is supported.
488
1187 by Martin Pool
- improved check for branch version
489
        The format level is stored, as an integer, in
490
        self._branch_format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
491
492
        In the future, we might need different in-memory Branch
493
        classes to support downlevel branches.  But not yet.
163 by mbp at sourcefrog
merge win32 portability fixes
494
        """
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
495
        try:
496
            fmt = self.controlfile('branch-format', 'r').read()
497
        except NoSuchFile:
1185.16.61 by mbp at sourcefrog
- start introducing hct error classes
498
            raise NotBranchError(path=self.base)
1393.1.63 by Martin Pool
- add some trace statements
499
        mutter("got branch format %r", fmt)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
500
        if fmt == BZR_BRANCH_FORMAT_6:
501
            self._branch_format = 6
502
        elif fmt == BZR_BRANCH_FORMAT_5:
1187 by Martin Pool
- improved check for branch version
503
            self._branch_format = 5
1294 by Martin Pool
- refactor branch version detection
504
        elif fmt == BZR_BRANCH_FORMAT_4:
505
            self._branch_format = 4
506
507
        if (not relax_version_check
1429 by Robert Collins
merge in niemeyers prefixed-store patch
508
            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
509
            raise errors.UnsupportedFormatError(
510
                           'sorry, branch format %r not supported' % fmt,
576 by Martin Pool
- raise exceptions rather than using bailout()
511
                           ['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.
512
                            'or remove the .bzr directory'
513
                            ' and "bzr init" again'])
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
514
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
515
    def get_root_id(self):
516
        """Return the id of this branches root"""
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
517
        inv = self.get_inventory(self.last_revision())
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
518
        return inv.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
519
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
520
    @needs_write_lock
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
521
    def add(self, files, ids=None):
1 by mbp at sourcefrog
import from baz patch-364
522
        """Make files versioned.
523
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
524
        Note that the command line normally calls smart_add instead,
525
        which can automatically recurse.
247 by mbp at sourcefrog
doc
526
1 by mbp at sourcefrog
import from baz patch-364
527
        This puts the files in the Added state, so that they will be
528
        recorded by the next commit.
529
596 by Martin Pool
doc
530
        files
531
            List of paths to add, relative to the base of the tree.
532
533
        ids
534
            If set, use these instead of automatically generated ids.
535
            Must be the same length as the list of files, but may
536
            contain None for ids that are to be autogenerated.
537
254 by Martin Pool
- Doc cleanups from Magnus Therning
538
        TODO: Perhaps have an option to add the ids even if the files do
596 by Martin Pool
doc
539
              not (yet) exist.
1 by mbp at sourcefrog
import from baz patch-364
540
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
541
        TODO: Perhaps yield the ids and paths as they're added.
1 by mbp at sourcefrog
import from baz patch-364
542
        """
543
        # TODO: Re-adding a file that is removed in the working copy
544
        # should probably put it back with the previous ID.
800 by Martin Pool
Merge John's import-speedup branch:
545
        if isinstance(files, basestring):
546
            assert(ids is None or isinstance(ids, basestring))
1 by mbp at sourcefrog
import from baz patch-364
547
            files = [files]
493 by Martin Pool
- Merge aaron's merge command
548
            if ids is not None:
549
                ids = [ids]
550
551
        if ids is None:
552
            ids = [None] * len(files)
553
        else:
554
            assert(len(ids) == len(files))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
555
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
556
        inv = self.working_tree().read_working_inventory()
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
557
        for f,file_id in zip(files, ids):
558
            if is_control_file(f):
559
                raise BzrError("cannot add control file %s" % quotefn(f))
560
561
            fp = splitpath(f)
562
563
            if len(fp) == 0:
564
                raise BzrError("cannot add top-level %r" % f)
565
566
            fullpath = os.path.normpath(self.abspath(f))
567
568
            try:
569
                kind = file_kind(fullpath)
570
            except OSError:
571
                # maybe something better?
572
                raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
573
574
            if not InventoryEntry.versionable_kind(kind):
575
                raise BzrError('cannot add: not a versionable file ('
576
                               'i.e. regular file, symlink or directory): %s' % quotefn(f))
577
578
            if file_id is None:
579
                file_id = gen_file_id(f)
580
            inv.add_path(f, kind=kind, file_id=file_id)
581
582
            mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
583
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
584
        self.working_tree()._write_inventory(inv)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
585
586
    @needs_read_lock
176 by mbp at sourcefrog
New cat command contributed by janmar.
587
    def print_file(self, file, revno):
588
        """Print `file` to stdout."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
589
        tree = self.revision_tree(self.get_rev_id(revno))
590
        # use inventory as it was in that revision
591
        file_id = tree.inventory.path2id(file)
592
        if not file_id:
593
            raise BzrError("%r is not present in revision %s" % (file, revno))
594
        tree.print_file(file_id)
595
1 by mbp at sourcefrog
import from baz patch-364
596
    def unknowns(self):
597
        """Return all unknown files.
598
599
        These are files in the working directory that are not versioned or
600
        control files or ignored.
601
        
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
602
        >>> from bzrlib.workingtree import WorkingTree
1 by mbp at sourcefrog
import from baz patch-364
603
        >>> b = ScratchBranch(files=['foo', 'foo~'])
1185.16.70 by Martin Pool
- improved handling of non-ascii branch names and test
604
        >>> map(str, b.unknowns())
1 by mbp at sourcefrog
import from baz patch-364
605
        ['foo']
606
        >>> b.add('foo')
607
        >>> list(b.unknowns())
608
        []
1442.1.65 by Robert Collins
Branch.remove has been moved to WorkingTree.
609
        >>> WorkingTree(b.base, b).remove('foo')
1 by mbp at sourcefrog
import from baz patch-364
610
        >>> list(b.unknowns())
1185.22.5 by Michael Ellerman
Fix doctest failure in Branch
611
        [u'foo']
1 by mbp at sourcefrog
import from baz patch-364
612
        """
613
        return self.working_tree().unknowns()
614
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
615
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
616
    def append_revision(self, *revision_ids):
617
        for revision_id in revision_ids:
618
            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.
619
        rev_history = self.revision_history()
620
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
621
        self.set_revision_history(rev_history)
622
623
    @needs_write_lock
624
    def set_revision_history(self, rev_history):
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
625
        self.put_controlfile('revision-history', '\n'.join(rev_history))
233 by mbp at sourcefrog
- more output from test.sh
626
1261 by Martin Pool
- new method Branch.has_revision
627
    def has_revision(self, revision_id):
628
        """True if this branch has a copy of the revision.
629
630
        This does not necessarily imply the revision is merge
631
        or on the mainline."""
1390 by Robert Collins
pair programming worx... merge integration and weave
632
        return (revision_id is None
1442.1.45 by Robert Collins
replace __contains__ calls in stores with has_id
633
                or self.revision_store.has_id(revision_id))
1261 by Martin Pool
- new method Branch.has_revision
634
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
635
    @needs_read_lock
1182 by Martin Pool
- more disentangling of xml storage format from objects
636
    def get_revision_xml_file(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
637
        """Return XML file object for revision object."""
638
        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.
639
            raise InvalidRevisionId(revision_id=revision_id, branch=self)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
640
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
641
            return self.revision_store.get(revision_id)
642
        except (IndexError, KeyError):
643
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
644
1182 by Martin Pool
- more disentangling of xml storage format from objects
645
    #deprecated
646
    get_revision_xml = get_revision_xml_file
647
1231 by Martin Pool
- more progress on fetch on top of weaves
648
    def get_revision_xml(self, revision_id):
649
        return self.get_revision_xml_file(revision_id).read()
650
651
1 by mbp at sourcefrog
import from baz patch-364
652
    def get_revision(self, revision_id):
653
        """Return the Revision object for a named revision"""
1182 by Martin Pool
- more disentangling of xml storage format from objects
654
        xml_file = self.get_revision_xml_file(revision_id)
1027 by Martin Pool
- better error message when failing to get revision from store
655
656
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
657
            r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
658
        except SyntaxError, e:
659
            raise bzrlib.errors.BzrError('failed to unpack revision_xml',
660
                                         [revision_id,
661
                                          str(e)])
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
662
            
1 by mbp at sourcefrog
import from baz patch-364
663
        assert r.revision_id == revision_id
664
        return r
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
665
666
    def get_revision_delta(self, revno):
667
        """Return the delta for one revision.
668
669
        The delta is relative to its mainline predecessor, or the
670
        empty tree for revision 1.
671
        """
672
        assert isinstance(revno, int)
673
        rh = self.revision_history()
674
        if not (1 <= revno <= len(rh)):
675
            raise InvalidRevisionNumber(revno)
676
677
        # revno is 1-based; list is 0-based
678
679
        new_tree = self.revision_tree(rh[revno-1])
680
        if revno == 1:
681
            old_tree = EmptyTree()
682
        else:
683
            old_tree = self.revision_tree(rh[revno-2])
684
685
        return compare_trees(old_tree, new_tree)
686
672 by Martin Pool
- revision records include the hash of their inventory and
687
    def get_revision_sha1(self, revision_id):
688
        """Hash the stored value of a revision, and return it."""
689
        # In the future, revision entries will be signed. At that
690
        # point, it is probably best *not* to include the signature
691
        # in the revision hash. Because that lets you re-sign
692
        # the revision, (add signatures/remove signatures) and still
693
        # have all hash pointers stay consistent.
694
        # But for now, just hash the contents.
1230 by Martin Pool
- remove Branch.get_revision_xml; use get_revision_xml_file instead
695
        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
696
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
697
    def get_ancestry(self, revision_id):
1415 by Robert Collins
remove the ancestry weave file
698
        """Return a list of revision-ids integrated by a revision.
699
        
700
        This currently returns a list, but the ordering is not guaranteed:
701
        treat it as a set.
702
        """
1390 by Robert Collins
pair programming worx... merge integration and weave
703
        if revision_id is None:
704
            return [None]
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
705
        w = self.get_inventory_weave()
1415 by Robert Collins
remove the ancestry weave file
706
        return [None] + map(w.idx_to_name,
707
                            w.inclusions([w.lookup(revision_id)]))
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
708
1223 by Martin Pool
- store inventories in weave
709
    def get_inventory_weave(self):
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
710
        return self.control_weaves.get_weave('inventory',
711
                                             self.get_transaction())
1223 by Martin Pool
- store inventories in weave
712
1192 by Martin Pool
- clean up code for retrieving stored inventories
713
    def get_inventory(self, revision_id):
1223 by Martin Pool
- store inventories in weave
714
        """Get Inventory object by hash."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
715
        xml = self.get_inventory_xml(revision_id)
716
        return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
717
1192 by Martin Pool
- clean up code for retrieving stored inventories
718
    def get_inventory_xml(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
719
        """Get inventory XML as a file object."""
1192 by Martin Pool
- clean up code for retrieving stored inventories
720
        try:
721
            assert isinstance(revision_id, basestring), type(revision_id)
1223 by Martin Pool
- store inventories in weave
722
            iw = self.get_inventory_weave()
723
            return iw.get_text(iw.lookup(revision_id))
1192 by Martin Pool
- clean up code for retrieving stored inventories
724
        except IndexError:
725
            raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
726
1192 by Martin Pool
- clean up code for retrieving stored inventories
727
    def get_inventory_sha1(self, revision_id):
672 by Martin Pool
- revision records include the hash of their inventory and
728
        """Return the sha1 hash of the inventory entry
729
        """
1223 by Martin Pool
- store inventories in weave
730
        return self.get_revision(revision_id).inventory_sha1
672 by Martin Pool
- revision records include the hash of their inventory and
731
1 by mbp at sourcefrog
import from baz patch-364
732
    def get_revision_inventory(self, revision_id):
733
        """Return inventory of a past revision."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
734
        # TODO: Unify this with get_inventory()
1218 by Martin Pool
- fix up import
735
        # 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
736
        # must be the same as its revision, so this is trivial.
1 by mbp at sourcefrog
import from baz patch-364
737
        if revision_id == None:
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
738
            # This does not make sense: if there is no revision,
739
            # then it is the current tree inventory surely ?!
740
            # and thus get_root_id() is something that looks at the last
741
            # commit on the branch, and the get_root_id is an inventory check.
742
            raise NotImplementedError
743
            # return Inventory(self.get_root_id())
1 by mbp at sourcefrog
import from baz patch-364
744
        else:
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
745
            return self.get_inventory(revision_id)
1 by mbp at sourcefrog
import from baz patch-364
746
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
747
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
748
    def revision_history(self):
1295 by Martin Pool
- remove pointless doctest
749
        """Return sequence of revision hashes on to this branch."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
750
        transaction = self.get_transaction()
751
        history = transaction.map.find_revision_history()
752
        if history is not None:
753
            mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
754
            return list(history)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
755
        history = [l.rstrip('\r\n') for l in
756
                self.controlfile('revision-history', 'r').readlines()]
757
        transaction.map.add_revision_history(history)
758
        # this call is disabled because revision_history is 
759
        # not really an object yet, and the transaction is for objects.
760
        # transaction.register_clean(history, precious=True)
761
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
762
763
    def revno(self):
764
        """Return current revision number for this branch.
765
766
        That is equivalent to the number of revisions committed to
767
        this branch.
768
        """
769
        return len(self.revision_history())
770
1241 by Martin Pool
- rename last_patch to last_revision
771
    def last_revision(self):
1 by mbp at sourcefrog
import from baz patch-364
772
        """Return last patch hash, or None if no history.
773
        """
774
        ph = self.revision_history()
775
        if ph:
776
            return ph[-1]
184 by mbp at sourcefrog
pychecker fixups
777
        else:
778
            return None
485 by Martin Pool
- move commit code into its own module
779
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
780
    def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
1260 by Martin Pool
- some updates for fetch/update function
781
        """Return a list of new revisions that would perfectly fit.
782
        
628 by Martin Pool
- merge aaron's updated merge/pull code
783
        If self and other have not diverged, return a list of the revisions
784
        present in other, but missing from self.
785
786
        >>> from bzrlib.commit import commit
787
        >>> bzrlib.trace.silent = True
788
        >>> br1 = ScratchBranch()
789
        >>> br2 = ScratchBranch()
790
        >>> br1.missing_revisions(br2)
791
        []
792
        >>> commit(br2, "lala!", rev_id="REVISION-ID-1")
793
        >>> br1.missing_revisions(br2)
794
        [u'REVISION-ID-1']
795
        >>> br2.missing_revisions(br1)
796
        []
797
        >>> commit(br1, "lala!", rev_id="REVISION-ID-1")
798
        >>> br1.missing_revisions(br2)
799
        []
800
        >>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
801
        >>> br1.missing_revisions(br2)
802
        [u'REVISION-ID-2A']
803
        >>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
804
        >>> br1.missing_revisions(br2)
805
        Traceback (most recent call last):
806
        DivergedBranches: These branches have diverged.
807
        """
808
        self_history = self.revision_history()
809
        self_len = len(self_history)
810
        other_history = other.revision_history()
811
        other_len = len(other_history)
812
        common_index = min(self_len, other_len) -1
813
        if common_index >= 0 and \
814
            self_history[common_index] != other_history[common_index]:
815
            raise DivergedBranches(self, other)
685 by Martin Pool
- add -r option to the branch command
816
817
        if stop_revision is None:
818
            stop_revision = other_len
1273 by Martin Pool
- fix up copy_branch, etc
819
        else:
820
            assert isinstance(stop_revision, int)
821
            if stop_revision > other_len:
822
                raise bzrlib.errors.NoSuchRevision(self, stop_revision)
685 by Martin Pool
- add -r option to the branch command
823
        return other_history[self_len:stop_revision]
824
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
825
    def update_revisions(self, other, stop_revision=None):
1390 by Robert Collins
pair programming worx... merge integration and weave
826
        """Pull in new perfect-fit revisions."""
974.1.33 by aaron.bentley at utoronto
Added greedy_fetch to update_revisions
827
        from bzrlib.fetch import greedy_fetch
974.1.75 by Aaron Bentley
Sped up pull by copying locally first
828
        if stop_revision is None:
1390 by Robert Collins
pair programming worx... merge integration and weave
829
            stop_revision = other.last_revision()
1185.12.44 by abentley
Restored branch convergence to bzr pull
830
        ### 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
831
        if (stop_revision is not None and 
832
            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
833
            return
1260 by Martin Pool
- some updates for fetch/update function
834
        greedy_fetch(to_branch=self, from_branch=other,
1261 by Martin Pool
- new method Branch.has_revision
835
                     revision=stop_revision)
1185.12.44 by abentley
Restored branch convergence to bzr pull
836
        pullable_revs = self.pullable_revisions(other, stop_revision)
1185.12.45 by abentley
Cleanups for pull
837
        if len(pullable_revs) > 0:
1261 by Martin Pool
- new method Branch.has_revision
838
            self.append_revision(*pullable_revs)
1185.12.44 by abentley
Restored branch convergence to bzr pull
839
840
    def pullable_revisions(self, other, stop_revision):
841
        other_revno = other.revision_id_to_revno(stop_revision)
842
        try:
843
            return self.missing_revisions(other, other_revno)
844
        except DivergedBranches, e:
845
            try:
846
                pullable_revs = get_intervening_revisions(self.last_revision(),
847
                                                          stop_revision, self)
848
                assert self.last_revision() not in pullable_revs
849
                return pullable_revs
850
            except bzrlib.errors.NotAncestor:
851
                if is_ancestor(self.last_revision(), stop_revision, self):
852
                    return []
853
                else:
854
                    raise e
855
        
485 by Martin Pool
- move commit code into its own module
856
    def commit(self, *args, **kw):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
857
        from bzrlib.commit import Commit
858
        Commit().commit(self, *args, **kw)
1390 by Robert Collins
pair programming worx... merge integration and weave
859
    
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
860
    def revision_id_to_revno(self, revision_id):
861
        """Given a revision id, return its revno"""
1390 by Robert Collins
pair programming worx... merge integration and weave
862
        if revision_id is None:
863
            return 0
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
864
        history = self.revision_history()
865
        try:
866
            return history.index(revision_id) + 1
867
        except ValueError:
868
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
869
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
870
    def get_rev_id(self, revno, history=None):
871
        """Find the revision id of the specified revno."""
872
        if revno == 0:
873
            return None
874
        if history is None:
875
            history = self.revision_history()
876
        elif revno <= 0 or revno > len(history):
877
            raise bzrlib.errors.NoSuchRevision(self, revno)
878
        return history[revno - 1]
879
1 by mbp at sourcefrog
import from baz patch-364
880
    def revision_tree(self, revision_id):
881
        """Return Tree for a revision on this branch.
882
883
        `revision_id` may be None for the null revision, in which case
884
        an `EmptyTree` is returned."""
529 by Martin Pool
todo
885
        # TODO: refactor this to use an existing revision object
886
        # so we don't need to read it in twice.
1185.12.98 by Aaron Bentley
Support for forcing merges of unrelated trees
887
        if revision_id == None or revision_id == NULL_REVISION:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
888
            return EmptyTree()
1 by mbp at sourcefrog
import from baz patch-364
889
        else:
890
            inv = self.get_revision_inventory(revision_id)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
891
            return RevisionTree(self.weave_store, inv, revision_id)
1 by mbp at sourcefrog
import from baz patch-364
892
893
    def working_tree(self):
894
        """Return a `Tree` for the working copy."""
1185.2.2 by Lalo Martins
cleaning up and refactoring the branch module.
895
        from bzrlib.workingtree import WorkingTree
1185.16.72 by Martin Pool
[merge] from robert and fix up tests
896
        # TODO: In the future, perhaps WorkingTree should utilize Transport
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
897
        # RobertCollins 20051003 - I don't think it should - working trees are
898
        # much more complex to keep consistent than our careful .bzr subset.
899
        # instead, we should say that working trees are local only, and optimise
900
        # for that.
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
901
        if self._transport.base.find('://') != -1:
902
            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.
903
        return WorkingTree(self.base, branch=self)
1 by mbp at sourcefrog
import from baz patch-364
904
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
905
    @needs_write_lock
906
    def pull(self, source, overwrite=False):
907
        source.lock_read()
908
        try:
909
            try:
910
                self.update_revisions(source)
911
            except DivergedBranches:
912
                if not overwrite:
913
                    raise
914
                self.set_revision_history(source.revision_history())
915
        finally:
916
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
917
918
    def basis_tree(self):
919
        """Return `Tree` object for last revision.
920
921
        If there are no revisions yet, return an `EmptyTree`.
922
        """
1241 by Martin Pool
- rename last_patch to last_revision
923
        return self.revision_tree(self.last_revision())
1 by mbp at sourcefrog
import from baz patch-364
924
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
925
    @needs_write_lock
168 by mbp at sourcefrog
new "rename" command
926
    def rename_one(self, from_rel, to_rel):
309 by Martin Pool
doc
927
        """Rename one file.
928
929
        This can change the directory or the filename or both.
353 by Martin Pool
- Per-branch locks in read and write modes.
930
        """
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
931
        tree = self.working_tree()
932
        inv = tree.inventory
933
        if not tree.has_filename(from_rel):
934
            raise BzrError("can't rename: old working file %r does not exist" % from_rel)
935
        if tree.has_filename(to_rel):
936
            raise BzrError("can't rename: new working file %r already exists" % to_rel)
937
938
        file_id = inv.path2id(from_rel)
939
        if file_id == None:
940
            raise BzrError("can't rename: old name %r is not versioned" % from_rel)
941
942
        if inv.path2id(to_rel):
943
            raise BzrError("can't rename: new name %r is already versioned" % to_rel)
944
945
        to_dir, to_tail = os.path.split(to_rel)
946
        to_dir_id = inv.path2id(to_dir)
947
        if to_dir_id == None and to_dir != '':
948
            raise BzrError("can't determine destination directory id for %r" % to_dir)
949
950
        mutter("rename_one:")
951
        mutter("  file_id    {%s}" % file_id)
952
        mutter("  from_rel   %r" % from_rel)
953
        mutter("  to_rel     %r" % to_rel)
954
        mutter("  to_dir     %r" % to_dir)
955
        mutter("  to_dir_id  {%s}" % to_dir_id)
956
957
        inv.rename(file_id, to_dir_id, to_tail)
958
959
        from_abs = self.abspath(from_rel)
960
        to_abs = self.abspath(to_rel)
171 by mbp at sourcefrog
better error message when working file rename fails
961
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
962
            rename(from_abs, to_abs)
963
        except OSError, e:
964
            raise BzrError("failed to rename %r to %r: %s"
965
                    % (from_abs, to_abs, e[1]),
966
                    ["rename rolled back"])
967
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
968
        self.working_tree()._write_inventory(inv)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
969
970
    @needs_write_lock
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
971
    def move(self, from_paths, to_name):
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
972
        """Rename files.
973
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
974
        to_name must exist as a versioned directory.
975
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
976
        If to_name exists and is a directory, the files are moved into
977
        it, keeping their old names.  If it is a directory, 
978
979
        Note that to_name is only the last component of the new name;
980
        this doesn't change the directory.
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
981
982
        This returns a list of (from_path, to_path) pairs for each
983
        entry that is moved.
160 by mbp at sourcefrog
- basic support for moving files to different directories - have not done support for renaming them yet, but should be straightforward - some tests, but many cases are not handled yet i think
984
        """
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
985
        result = []
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
986
        ## TODO: Option to move IDs only
987
        assert not isinstance(from_paths, basestring)
988
        tree = self.working_tree()
989
        inv = tree.inventory
990
        to_abs = self.abspath(to_name)
991
        if not isdir(to_abs):
992
            raise BzrError("destination %r is not a directory" % to_abs)
993
        if not tree.has_filename(to_name):
994
            raise BzrError("destination %r not in working directory" % to_abs)
995
        to_dir_id = inv.path2id(to_name)
996
        if to_dir_id == None and to_name != '':
997
            raise BzrError("destination %r is not a versioned directory" % to_name)
998
        to_dir_ie = inv[to_dir_id]
999
        if to_dir_ie.kind not in ('directory', 'root_directory'):
1000
            raise BzrError("destination %r is not a directory" % to_abs)
1001
1002
        to_idpath = inv.get_idpath(to_dir_id)
1003
1004
        for f in from_paths:
1005
            if not tree.has_filename(f):
1006
                raise BzrError("%r does not exist in working tree" % f)
1007
            f_id = inv.path2id(f)
1008
            if f_id == None:
1009
                raise BzrError("%r is not versioned" % f)
1010
            name_tail = splitpath(f)[-1]
1011
            dest_path = appendpath(to_name, name_tail)
1012
            if tree.has_filename(dest_path):
1013
                raise BzrError("destination %r already exists" % dest_path)
1014
            if f_id in to_idpath:
1015
                raise BzrError("can't move %r to a subdirectory of itself" % f)
1016
1017
        # OK, so there's a race here, it's possible that someone will
1018
        # create a file in this interval and then the rename might be
1019
        # left half-done.  But we should have caught most problems.
1020
1021
        for f in from_paths:
1022
            name_tail = splitpath(f)[-1]
1023
            dest_path = appendpath(to_name, name_tail)
1024
            result.append((f, dest_path))
1025
            inv.rename(inv.path2id(f), to_dir_id, name_tail)
1026
            try:
1027
                rename(self.abspath(f), self.abspath(dest_path))
1028
            except OSError, e:
1029
                raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1030
                        ["rename rolled back"])
1031
1457.1.11 by Robert Collins
Move _write_inventory to WorkingTree.
1032
        self.working_tree()._write_inventory(inv)
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1033
        return result
1034
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1035
    def get_parent(self):
1036
        """Return the parent location of the branch.
1037
1038
        This is the default location for push/pull/missing.  The usual
1039
        pattern is that the user can override it by specifying a
1040
        location.
1041
        """
1042
        import errno
1043
        _locs = ['parent', 'pull', 'x-pull']
1044
        for l in _locs:
1045
            try:
1046
                return self.controlfile(l, 'r').read().strip('\n')
1047
            except IOError, e:
1048
                if e.errno != errno.ENOENT:
1049
                    raise
1050
        return None
1051
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1052
    def get_push_location(self):
1053
        """Return the None or the location to push this branch to."""
1054
        config = bzrlib.config.BranchConfig(self)
1055
        push_loc = config.get_user_option('push_location')
1056
        return push_loc
1057
1058
    def set_push_location(self, location):
1059
        """Set a new push location for this branch."""
1060
        config = bzrlib.config.LocationConfig(self.base)
1061
        config.set_user_option('push_location', location)
1062
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1063
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1064
    def set_parent(self, url):
1065
        # TODO: Maybe delete old location files?
1066
        from bzrlib.atomicfile import AtomicFile
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1067
        f = AtomicFile(self.controlfilename('parent'))
1150 by Martin Pool
- add new Branch.set_parent and tests
1068
        try:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1069
            f.write(url + '\n')
1070
            f.commit()
1150 by Martin Pool
- add new Branch.set_parent and tests
1071
        finally:
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1072
            f.close()
1150 by Martin Pool
- add new Branch.set_parent and tests
1073
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
1074
    def check_revno(self, revno):
1075
        """\
1076
        Check whether a revno corresponds to any revision.
1077
        Zero (the NULL revision) is considered valid.
1078
        """
1079
        if revno != 0:
1080
            self.check_real_revno(revno)
1081
            
1082
    def check_real_revno(self, revno):
1083
        """\
1084
        Check whether a revno corresponds to a real revision.
1085
        Zero (the NULL revision) is considered invalid
1086
        """
1087
        if revno < 1 or revno > self.revno():
1088
            raise InvalidRevisionNumber(revno)
1089
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
1090
    def sign_revision(self, revision_id, gpg_strategy):
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
1091
        plaintext = Testament.from_revision(self, revision_id).as_short_text()
1092
        self.store_revision_signature(gpg_strategy, plaintext, revision_id)
1093
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1094
    @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.
1095
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1096
        self.revision_store.add(StringIO(gpg_strategy.sign(plaintext)), 
1097
                                revision_id, "sig")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1098
1099
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
1100
class ScratchBranch(_Branch):
1 by mbp at sourcefrog
import from baz patch-364
1101
    """Special test class: a branch that cleans up after itself.
1102
1103
    >>> b = ScratchBranch()
1104
    >>> isdir(b.base)
1105
    True
1106
    >>> bd = b.base
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1107
    >>> b._transport.__del__()
1 by mbp at sourcefrog
import from baz patch-364
1108
    >>> isdir(bd)
1109
    False
1110
    """
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1111
1112
    def __init__(self, files=[], dirs=[], transport=None):
1 by mbp at sourcefrog
import from baz patch-364
1113
        """Make a test branch.
1114
1115
        This creates a temporary directory and runs init-tree in it.
1116
1117
        If any files are listed, they are created in the working copy.
1118
        """
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1119
        if transport is None:
1120
            transport = bzrlib.transport.local.ScratchTransport()
1121
            super(ScratchBranch, self).__init__(transport, init=True)
1122
        else:
1123
            super(ScratchBranch, self).__init__(transport)
1124
100 by mbp at sourcefrog
- add test case for ignore files
1125
        for d in dirs:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1126
            self._transport.mkdir(d)
100 by mbp at sourcefrog
- add test case for ignore files
1127
            
1 by mbp at sourcefrog
import from baz patch-364
1128
        for f in files:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1129
            self._transport.put(f, 'content of %s' % f)
1 by mbp at sourcefrog
import from baz patch-364
1130
1131
622 by Martin Pool
Updated merge patch from Aaron
1132
    def clone(self):
1133
        """
1134
        >>> orig = ScratchBranch(files=["file1", "file2"])
1135
        >>> clone = orig.clone()
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1136
        >>> if os.name != 'nt':
1137
        ...   os.path.samefile(orig.base, clone.base)
1138
        ... else:
1139
        ...   orig.base == clone.base
1140
        ...
622 by Martin Pool
Updated merge patch from Aaron
1141
        False
1142
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
1143
        True
1144
        """
800 by Martin Pool
Merge John's import-speedup branch:
1145
        from shutil import copytree
1146
        from tempfile import mkdtemp
1147
        base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1148
        os.rmdir(base)
800 by Martin Pool
Merge John's import-speedup branch:
1149
        copytree(self.base, base, symlinks=True)
1442.1.42 by Robert Collins
rebuild ScratchBranch on top of ScratchTransport
1150
        return ScratchBranch(
1151
            transport=bzrlib.transport.local.ScratchTransport(base))
1 by mbp at sourcefrog
import from baz patch-364
1152
    
1153
1154
######################################################################
1155
# predicates
1156
1157
1158
def is_control_file(filename):
1159
    ## FIXME: better check
1160
    filename = os.path.normpath(filename)
1161
    while filename != '':
1162
        head, tail = os.path.split(filename)
1163
        ## mutter('check %r for control file' % ((head, tail), ))
1164
        if tail == bzrlib.BZRDIR:
1165
            return True
70 by mbp at sourcefrog
Prepare for smart recursive add.
1166
        if filename == head:
1167
            break
1 by mbp at sourcefrog
import from baz patch-364
1168
        filename = head
1169
    return False
1170
1171
1172
70 by mbp at sourcefrog
Prepare for smart recursive add.
1173
def gen_file_id(name):
1 by mbp at sourcefrog
import from baz patch-364
1174
    """Return new file id.
1175
1176
    This should probably generate proper UUIDs, but for the moment we
1177
    cope with just randomness because running uuidgen every time is
1178
    slow."""
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1179
    import re
800 by Martin Pool
Merge John's import-speedup branch:
1180
    from binascii import hexlify
1181
    from time import time
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1182
1183
    # get last component
70 by mbp at sourcefrog
Prepare for smart recursive add.
1184
    idx = name.rfind('/')
1185
    if idx != -1:
1186
        name = name[idx+1 : ]
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
1187
    idx = name.rfind('\\')
1188
    if idx != -1:
1189
        name = name[idx+1 : ]
70 by mbp at sourcefrog
Prepare for smart recursive add.
1190
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1191
    # make it not a hidden file
70 by mbp at sourcefrog
Prepare for smart recursive add.
1192
    name = name.lstrip('.')
1193
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1194
    # remove any wierd characters; we don't escape them but rather
1195
    # just pull them out
1196
    name = re.sub(r'[^\w.]', '', name)
1197
190 by mbp at sourcefrog
64 bits of randomness in file/revision ids
1198
    s = hexlify(rand_bytes(8))
800 by Martin Pool
Merge John's import-speedup branch:
1199
    return '-'.join((name, compact_date(time()), s))
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1200
1201
1202
def gen_root_id():
1203
    """Return a new tree-root file id."""
1204
    return gen_file_id('TREE_ROOT')
1205
1092.1.34 by Robert Collins
unbreak cmd_branch now that something tests the core of it..
1206