/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
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
18
import sys
19
import os
1371 by Martin Pool
- raise NotBranchError if format file can't be read
20
import errno
1372 by Martin Pool
- avoid converting inventories to/from StringIO
21
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.
22
from cStringIO import StringIO
1372 by Martin Pool
- avoid converting inventories to/from StringIO
23
1 by mbp at sourcefrog
import from baz patch-364
24
25
import bzrlib
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
26
from bzrlib.inventory import InventoryEntry
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
27
import bzrlib.inventory as inventory
800 by Martin Pool
Merge John's import-speedup branch:
28
from bzrlib.trace import mutter, note
1390 by Robert Collins
pair programming worx... merge integration and weave
29
from bzrlib.osutils import (isdir, quotefn, compact_date, rand_bytes, 
30
                            rename, splitpath, sha_file, appendpath, 
31
                            file_kind)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
32
import bzrlib.errors as errors
1192 by Martin Pool
- clean up code for retrieving stored inventories
33
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
1299 by Martin Pool
- tidy up imports
34
                           NoSuchRevision, HistoryMissing, NotBranchError,
1391 by Robert Collins
merge from integration
35
                           DivergedBranches, LockError, UnlistableStore,
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
36
                           UnlistableBranch, NoSuchFile)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
37
from bzrlib.textui import show_status
1415 by Robert Collins
remove the ancestry weave file
38
from bzrlib.revision import Revision
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
39
from bzrlib.delta import compare_trees
40
from bzrlib.tree import EmptyTree, RevisionTree
1192 by Martin Pool
- clean up code for retrieving stored inventories
41
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.
42
from bzrlib.store import copy_all
43
from bzrlib.store.compressed_text import CompressedTextStore
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
44
from bzrlib.store.text import TextStore
1393.2.3 by John Arbash Meinel
Fixing typos, updating stores, getting tests to pass.
45
from bzrlib.store.weave import WeaveStore
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
46
import bzrlib.transactions as transactions
1393.2.4 by John Arbash Meinel
All tests pass.
47
from bzrlib.transport import Transport, get_transport
1189 by Martin Pool
- BROKEN: partial support for commit into weave
48
import bzrlib.xml5
1104 by Martin Pool
- Add a simple UIFactory
49
import bzrlib.ui
50
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
51
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
52
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
53
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1429 by Robert Collins
merge in niemeyers prefixed-store patch
54
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
1 by mbp at sourcefrog
import from baz patch-364
55
## TODO: Maybe include checks for common corruption of newlines, etc?
56
57
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
58
# TODO: Some operations like log might retrieve the same revisions
59
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
60
# cache in memory to make this faster.  In general anything can be
61
# cached in memory between lock and unlock operations.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
62
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
63
def find_branch(*ignored, **ignored_too):
64
    # XXX: leave this here for about one release, then remove it
65
    raise NotImplementedError('find_branch() is not supported anymore, '
66
                              'please use one of the new branch constructors')
600 by Martin Pool
- Better Branch.relpath that doesn't match on
67
def _relpath(base, path):
68
    """Return path relative to base, or raise exception.
69
70
    The path may be either an absolute path or a path relative to the
71
    current working directory.
72
73
    Lifted out of Branch.relpath for ease of testing.
74
75
    os.path.commonprefix (python2.4) has a bad bug that it works just
76
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
77
    avoids that problem."""
78
    rp = os.path.abspath(path)
79
80
    s = []
81
    head = rp
82
    while len(head) >= len(base):
83
        if head == base:
84
            break
85
        head, tail = os.path.split(head)
86
        if tail:
87
            s.insert(0, tail)
88
    else:
89
        raise NotBranchError("path %r is not within branch %r" % (rp, base))
90
91
    return os.sep.join(s)
416 by Martin Pool
- bzr log and bzr root now accept an http URL
92
        
93
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
94
def find_branch_root(t):
95
    """Find the branch root enclosing the transport's base.
96
97
    t is a Transport object.
98
99
    It is not necessary that the base of t exists.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
100
101
    Basically we keep looking up until we find the control directory or
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
102
    run into the root.  If there isn't one, raises NotBranchError.
103
    """
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
104
    orig_base = t.base
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
105
    while True:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
106
        if t.has(bzrlib.BZRDIR):
107
            return t
108
        new_t = t.clone('..')
109
        if new_t.base == t.base:
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
110
            # reached the root, whatever that may be
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
111
            raise NotBranchError('%s is not in a branch' % orig_base)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
112
        t = new_t
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
113
685 by Martin Pool
- add -r option to the branch command
114
1 by mbp at sourcefrog
import from baz patch-364
115
######################################################################
116
# branch objects
117
558 by Martin Pool
- All top-level classes inherit from object
118
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
119
    """Branch holding a history of revisions.
120
343 by Martin Pool
doc
121
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
122
        Base directory/url of the branch.
123
    """
124
    base = None
125
126
    def __init__(self, *ignored, **ignored_too):
127
        raise NotImplementedError('The Branch class is abstract')
128
129
    @staticmethod
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
130
    def open_downlevel(base):
131
        """Open a branch which may be of an old format.
132
        
133
        Only local branches are supported."""
1393.1.16 by Martin Pool
- fix up Branch.open_downlevel for Transport
134
        return _Branch(get_transport(base), relax_version_check=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
135
        
136
    @staticmethod
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
137
    def open(base):
138
        """Open an existing branch, rooted at 'base' (url)"""
1393.2.4 by John Arbash Meinel
All tests pass.
139
        t = get_transport(base)
1393.1.63 by Martin Pool
- add some trace statements
140
        mutter("trying to open %r with transport %r", base, t)
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
141
        return _Branch(t)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
142
143
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
144
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
145
        """Open an existing branch which contains url.
146
        
147
        This probes for a branch at url, and searches upwards from there.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
148
        """
1393.2.4 by John Arbash Meinel
All tests pass.
149
        t = get_transport(url)
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
150
        t = find_branch_root(t)
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
151
        return _Branch(t)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
152
153
    @staticmethod
154
    def initialize(base):
155
        """Create a new branch, rooted at 'base' (url)"""
1393.2.4 by John Arbash Meinel
All tests pass.
156
        t = get_transport(base)
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
157
        return _Branch(t, init=True)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
158
159
    def setup_caching(self, cache_root):
160
        """Subclasses that care about caching should override this, and set
161
        up cached stores located under cache_root.
162
        """
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
163
        self.cache_root = cache_root
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
164
165
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
166
class _Branch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
167
    """A branch stored in the actual filesystem.
168
169
    Note that it's "local" in the context of the filesystem; it doesn't
170
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
171
    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,
172
173
    _lock_mode
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
174
        None, or 'r' or 'w'
175
176
    _lock_count
177
        If _lock_mode is true, a positive count of the number of times the
178
        lock has been taken.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
179
614 by Martin Pool
- unify two defintions of LockError
180
    _lock
181
        Lock object from bzrlib.lock.
1 by mbp at sourcefrog
import from baz patch-364
182
    """
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
183
    # We actually expect this class to be somewhat short-lived; part of its
184
    # purpose is to try to isolate what bits of the branch logic are tied to
185
    # filesystem access, so that in a later step, we can extricate them to
186
    # a separarte ("storage") class.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
187
    _lock_mode = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
188
    _lock_count = None
615 by Martin Pool
Major rework of locking code:
189
    _lock = None
1223 by Martin Pool
- store inventories in weave
190
    _inventory_weave = None
353 by Martin Pool
- Per-branch locks in read and write modes.
191
    
897 by Martin Pool
- merge john's revision-naming code
192
    # Map some sort of prefix into a namespace
193
    # stuff like "revno:10", "revid:", etc.
194
    # This should match a prefix with a function which accepts
195
    REVISION_NAMESPACES = {}
196
1391 by Robert Collins
merge from integration
197
    def push_stores(self, branch_to):
198
        """Copy the content of this branches store to branch_to."""
199
        if (self._branch_format != branch_to._branch_format
200
            or self._branch_format != 4):
201
            from bzrlib.fetch import greedy_fetch
1393 by Robert Collins
reenable remotebranch tests
202
            mutter("falling back to fetch logic to push between %s(%s) and %s(%s)",
203
                   self, self._branch_format, branch_to, branch_to._branch_format)
1391 by Robert Collins
merge from integration
204
            greedy_fetch(to_branch=branch_to, from_branch=self,
205
                         revision=self.last_revision())
206
            return
207
208
        store_pairs = ((self.text_store,      branch_to.text_store),
209
                       (self.inventory_store, branch_to.inventory_store),
210
                       (self.revision_store,  branch_to.revision_store))
211
        try:
212
            for from_store, to_store in store_pairs: 
213
                copy_all(from_store, to_store)
214
        except UnlistableStore:
215
            raise UnlistableBranch(from_store)
216
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
217
    def __init__(self, transport, init=False,
1293 by Martin Pool
- add Branch constructor option to relax version check
218
                 relax_version_check=False):
1 by mbp at sourcefrog
import from baz patch-364
219
        """Create new branch object at a particular location.
220
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
221
        transport -- A Transport object, defining how to access files.
222
                (If a string, transport.transport() will be used to
223
                create a Transport object)
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
224
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
225
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
226
             unversioned directory.  If False, the branch must already
227
             be versioned.
228
1293 by Martin Pool
- add Branch constructor option to relax version check
229
        relax_version_check -- If true, the usual check for the branch
230
            version is not applied.  This is intended only for
231
            upgrade/recovery type use; it's not guaranteed that
232
            all operations will work on old format branches.
233
1 by mbp at sourcefrog
import from baz patch-364
234
        In the test suite, creation of new trees is tested using the
235
        `ScratchBranch` class.
236
        """
1393.1.15 by Martin Pool
- better assertion message
237
        assert isinstance(transport, Transport), \
238
            "%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
239
        self._transport = transport
1 by mbp at sourcefrog
import from baz patch-364
240
        if init:
241
            self._make_control()
1293 by Martin Pool
- add Branch constructor option to relax version check
242
        self._check_format(relax_version_check)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
243
1429 by Robert Collins
merge in niemeyers prefixed-store patch
244
        def get_store(name, compressed=True, prefixed=False):
1393.1.41 by Martin Pool
doc
245
            # FIXME: This approach of assuming stores are all entirely compressed
246
            # or entirely uncompressed is tidy, but breaks upgrade from 
247
            # some existing branches where there's a mixture; we probably 
248
            # still want the option to look for both.
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
249
            relpath = self._rel_controlfilename(name)
250
            if compressed:
1429 by Robert Collins
merge in niemeyers prefixed-store patch
251
                store = CompressedTextStore(self._transport.clone(relpath),
252
                                            prefixed=prefixed)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
253
            else:
1429 by Robert Collins
merge in niemeyers prefixed-store patch
254
                store = TextStore(self._transport.clone(relpath),
255
                                  prefixed=prefixed)
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
256
            #if self._transport.should_cache():
257
            #    cache_path = os.path.join(self.cache_root, name)
258
            #    os.mkdir(cache_path)
259
            #    store = bzrlib.store.CachedStore(store, cache_path)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
260
            return store
1429 by Robert Collins
merge in niemeyers prefixed-store patch
261
        def get_weave(name, prefixed=False):
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
262
            relpath = self._rel_controlfilename(name)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
263
            ws = WeaveStore(self._transport.clone(relpath), prefixed=prefixed)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
264
            if self._transport.should_cache():
265
                ws.enable_cache = True
266
            return ws
267
1296 by Martin Pool
- v4 branch should allow access to inventory and text stores
268
        if self._branch_format == 4:
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
269
            self.inventory_store = get_store('inventory-store')
270
            self.text_store = get_store('text-store')
271
            self.revision_store = get_store('revision-store')
1390 by Robert Collins
pair programming worx... merge integration and weave
272
        elif self._branch_format == 5:
1393.2.3 by John Arbash Meinel
Fixing typos, updating stores, getting tests to pass.
273
            self.control_weaves = get_weave([])
274
            self.weave_store = get_weave('weaves')
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
275
            self.revision_store = get_store('revision-store', compressed=False)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
276
        elif self._branch_format == 6:
277
            self.control_weaves = get_weave([])
278
            self.weave_store = get_weave('weaves', prefixed=True)
279
            self.revision_store = get_store('revision-store', compressed=False,
280
                                            prefixed=True)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
281
        self._transaction = None
1 by mbp at sourcefrog
import from baz patch-364
282
283
    def __str__(self):
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
284
        return '%s(%r)' % (self.__class__.__name__, self._transport.base)
1 by mbp at sourcefrog
import from baz patch-364
285
286
287
    __repr__ = __str__
288
289
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
290
    def __del__(self):
615 by Martin Pool
Major rework of locking code:
291
        if self._lock_mode or self._lock:
1390 by Robert Collins
pair programming worx... merge integration and weave
292
            # XXX: This should show something every time, and be suitable for
293
            # headless operation and embedding
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
294
            warn("branch %r was not explicitly unlocked" % self)
615 by Martin Pool
Major rework of locking code:
295
            self._lock.unlock()
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
296
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
297
        # TODO: It might be best to do this somewhere else,
298
        # but it is nice for a Branch object to automatically
299
        # cache it's information.
300
        # Alternatively, we could have the Transport objects cache requests
301
        # See the earlier discussion about how major objects (like Branch)
302
        # should never expect their __del__ function to run.
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
303
        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.
304
            try:
305
                import shutil
306
                shutil.rmtree(self.cache_root)
307
            except:
308
                pass
309
            self.cache_root = None
310
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
311
    def _get_base(self):
907.1.19 by John Arbash Meinel
Updated ScratchBranch and Branch.base, All Tests PASS !!!
312
        if self._transport:
313
            return self._transport.base
314
        return None
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
315
316
    base = property(_get_base)
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
317
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
318
    def _finish_transaction(self):
319
        """Exit the current transaction."""
320
        if self._transaction is None:
321
            raise errors.LockError('Branch %s is not in a transaction' %
322
                                   self)
323
        transaction = self._transaction
324
        self._transaction = None
325
        transaction.finish()
326
327
    def get_transaction(self):
328
        """Return the current active transaction.
329
330
        If no transaction is active, this returns a passthrough object
331
        for which all data is immedaitely flushed and no caching happens.
332
        """
333
        if self._transaction is None:
334
            return transactions.PassThroughTransaction()
335
        else:
336
            return self._transaction
337
338
    def _set_transaction(self, new_transaction):
339
        """Set a new active transaction."""
340
        if self._transaction is not None:
341
            raise errors.LockError('Branch %s is in a transaction already.' %
342
                                   self)
343
        self._transaction = new_transaction
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
344
345
    def lock_write(self):
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
346
        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.
347
        # TODO: Upgrade locking to support using a Transport,
348
        # and potentially a remote locking protocol
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
349
        if self._lock_mode:
350
            if self._lock_mode != 'w':
351
                raise LockError("can't upgrade to a write lock from %r" %
352
                                self._lock_mode)
353
            self._lock_count += 1
354
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
355
            self._lock = self._transport.lock_write(
356
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
357
            self._lock_mode = 'w'
358
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
359
            self._set_transaction(transactions.PassThroughTransaction())
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
360
361
    def lock_read(self):
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
362
        mutter("lock read: %s (%s)", self, self._lock_count)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
363
        if self._lock_mode:
364
            assert self._lock_mode in ('r', 'w'), \
365
                   "invalid lock mode %r" % self._lock_mode
366
            self._lock_count += 1
367
        else:
907.1.24 by John Arbash Meinel
Remote functionality work.
368
            self._lock = self._transport.lock_read(
369
                    self._rel_controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
370
            self._lock_mode = 'r'
371
            self._lock_count = 1
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
372
            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.
373
            # 5K may be excessive, but hey, its a knob.
374
            self.get_transaction().set_cache_size(5000)
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
375
                        
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
376
    def unlock(self):
1437 by Robert Collins
lock during fetch, which is a separate code path to the special case of cloning
377
        mutter("unlock: %s (%s)", self, self._lock_count)
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
378
        if not self._lock_mode:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
379
            raise LockError('branch %r is not locked' % (self))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
380
381
        if self._lock_count > 1:
382
            self._lock_count -= 1
383
        else:
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
384
            self._finish_transaction()
615 by Martin Pool
Major rework of locking code:
385
            self._lock.unlock()
386
            self._lock = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
387
            self._lock_mode = self._lock_count = None
353 by Martin Pool
- Per-branch locks in read and write modes.
388
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
389
    def abspath(self, name):
390
        """Return absolute filename for something in the branch"""
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
391
        return self._transport.abspath(name)
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
392
68 by mbp at sourcefrog
- new relpath command and function
393
    def relpath(self, path):
394
        """Return path relative to this branch of something inside it.
395
396
        Raises an error if path is not in this branch."""
907.1.24 by John Arbash Meinel
Remote functionality work.
397
        return self._transport.relpath(path)
68 by mbp at sourcefrog
- new relpath command and function
398
399
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
400
    def _rel_controlfilename(self, file_or_path):
401
        if isinstance(file_or_path, basestring):
402
            file_or_path = [file_or_path]
403
        return [bzrlib.BZRDIR] + file_or_path
404
1 by mbp at sourcefrog
import from baz patch-364
405
    def controlfilename(self, file_or_path):
406
        """Return location relative to branch."""
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
407
        return self._transport.abspath(self._rel_controlfilename(file_or_path))
1 by mbp at sourcefrog
import from baz patch-364
408
409
410
    def controlfile(self, file_or_path, mode='r'):
245 by mbp at sourcefrog
- control files always in utf-8-unix format
411
        """Open a control file for this branch.
412
413
        There are two classes of file in the control directory: text
414
        and binary.  binary files are untranslated byte streams.  Text
415
        control files are stored with Unix newlines and in UTF-8, even
416
        if the platform or locale defaults are different.
430 by Martin Pool
doc
417
418
        Controlfiles should almost never be opened in write mode but
419
        rather should be atomically copied and replaced using atomicfile.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
420
        """
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
421
        import codecs
422
423
        relpath = self._rel_controlfilename(file_or_path)
424
        #TODO: codecs.open() buffers linewise, so it was overloaded with
425
        # a much larger buffer, do we need to do the same for getreader/getwriter?
426
        if mode == 'rb': 
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
427
            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.
428
        elif mode == 'wb':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
429
            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.
430
        elif mode == 'r':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
431
            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.
432
        elif mode == 'w':
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
433
            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
434
        else:
435
            raise BzrError("invalid controlfile mode %r" % mode)
436
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
437
    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
438
        """Write an entry as a controlfile.
439
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
440
        :param path: The path to put the file, relative to the .bzr control
441
                     directory
442
        :param f: A file-like or string object whose contents should be copied.
443
        :param encode:  If true, encode the contents as utf-8
444
        """
445
        self.put_controlfiles([(path, f)], encode=encode)
446
447
    def put_controlfiles(self, files, encode=True):
448
        """Write several entries as controlfiles.
449
450
        :param files: A list of [(path, file)] pairs, where the path is the directory
451
                      underneath the bzr control directory
452
        :param encode:  If true, encode the contents as utf-8
453
        """
454
        import codecs
455
        ctrl_files = []
456
        for path, f in files:
457
            if encode:
458
                if isinstance(f, basestring):
459
                    f = f.encode('utf-8', 'replace')
460
                else:
461
                    f = codecs.getwriter('utf-8')(f, errors='replace')
462
            path = self._rel_controlfilename(path)
463
            ctrl_files.append((path, f))
464
        self._transport.put_multi(ctrl_files)
1 by mbp at sourcefrog
import from baz patch-364
465
466
    def _make_control(self):
800 by Martin Pool
Merge John's import-speedup branch:
467
        from bzrlib.inventory import Inventory
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
468
        from bzrlib.weavefile import write_weave_v5
469
        from bzrlib.weave import Weave
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
470
        
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
471
        # 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
472
        sio = StringIO()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
473
        # if we want per-tree root ids then this is the place to set
474
        # them; they're not needed for now and so ommitted for
475
        # simplicity.
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
476
        bzrlib.xml5.serializer_v5.write_inventory(Inventory(), sio)
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
477
        empty_inv = sio.getvalue()
478
        sio = StringIO()
479
        bzrlib.weavefile.write_weave_v5(Weave(), sio)
480
        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
481
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
482
        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
483
        files = [('README', 
1 by mbp at sourcefrog
import from baz patch-364
484
            "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
485
            "Do not change any files in this directory.\n"),
1429 by Robert Collins
merge in niemeyers prefixed-store patch
486
            ('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
487
            ('revision-history', ''),
488
            ('branch-name', ''),
489
            ('branch-lock', ''),
490
            ('pending-merges', ''),
1393.2.2 by John Arbash Meinel
Updated stores to use Transport
491
            ('inventory', empty_inv),
492
            ('inventory.weave', empty_weave),
493
            ('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
494
        ]
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
495
        cfn = self._rel_controlfilename
496
        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.
497
        self.put_controlfiles(files)
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
498
        mutter('created control directory in ' + self._transport.base)
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
499
1293 by Martin Pool
- add Branch constructor option to relax version check
500
    def _check_format(self, relax_version_check):
1 by mbp at sourcefrog
import from baz patch-364
501
        """Check this branch format is supported.
502
1187 by Martin Pool
- improved check for branch version
503
        The format level is stored, as an integer, in
504
        self._branch_format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
505
506
        In the future, we might need different in-memory Branch
507
        classes to support downlevel branches.  But not yet.
163 by mbp at sourcefrog
merge win32 portability fixes
508
        """
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
509
        try:
510
            fmt = self.controlfile('branch-format', 'r').read()
511
        except NoSuchFile:
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
512
            raise NotBranchError(self.base)
1393.1.63 by Martin Pool
- add some trace statements
513
        mutter("got branch format %r", fmt)
1429 by Robert Collins
merge in niemeyers prefixed-store patch
514
        if fmt == BZR_BRANCH_FORMAT_6:
515
            self._branch_format = 6
516
        elif fmt == BZR_BRANCH_FORMAT_5:
1187 by Martin Pool
- improved check for branch version
517
            self._branch_format = 5
1294 by Martin Pool
- refactor branch version detection
518
        elif fmt == BZR_BRANCH_FORMAT_4:
519
            self._branch_format = 4
520
521
        if (not relax_version_check
1429 by Robert Collins
merge in niemeyers prefixed-store patch
522
            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
523
            raise errors.UnsupportedFormatError(
524
                           'sorry, branch format %r not supported' % fmt,
576 by Martin Pool
- raise exceptions rather than using bailout()
525
                           ['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.
526
                            'or remove the .bzr directory'
527
                            ' and "bzr init" again'])
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
528
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
529
    def get_root_id(self):
530
        """Return the id of this branches root"""
531
        inv = self.read_working_inventory()
532
        return inv.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
533
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
534
    def set_root_id(self, file_id):
535
        inv = self.read_working_inventory()
536
        orig_root_id = inv.root.file_id
537
        del inv._byid[inv.root.file_id]
538
        inv.root.file_id = file_id
539
        inv._byid[inv.root.file_id] = inv.root
540
        for fid in inv:
541
            entry = inv[fid]
542
            if entry.parent_id in (None, orig_root_id):
543
                entry.parent_id = inv.root.file_id
544
        self._write_inventory(inv)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
545
1 by mbp at sourcefrog
import from baz patch-364
546
    def read_working_inventory(self):
547
        """Read the working inventory."""
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
548
        self.lock_read()
549
        try:
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
550
            # ElementTree does its own conversion from UTF-8, so open in
551
            # binary.
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
552
            f = self.controlfile('inventory', 'rb')
1189 by Martin Pool
- BROKEN: partial support for commit into weave
553
            return bzrlib.xml5.serializer_v5.read_inventory(f)
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
554
        finally:
555
            self.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
556
            
1 by mbp at sourcefrog
import from baz patch-364
557
558
    def _write_inventory(self, inv):
559
        """Update the working inventory.
560
561
        That is to say, the inventory describing changes underway, that
562
        will be committed to the next revision.
563
        """
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
564
        from cStringIO import StringIO
770 by Martin Pool
- write new working inventory using AtomicFile
565
        self.lock_write()
566
        try:
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
567
            sio = StringIO()
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
568
            bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
569
            sio.seek(0)
1185.11.1 by John Arbash Meinel
(broken) Transport work is merged in. Tests do not pass yet.
570
            # Transport handles atomicity
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
571
            self.put_controlfile('inventory', sio)
770 by Martin Pool
- write new working inventory using AtomicFile
572
        finally:
573
            self.unlock()
574
        
14 by mbp at sourcefrog
write inventory to temporary file and atomically replace
575
        mutter('wrote working inventory')
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
576
            
1 by mbp at sourcefrog
import from baz patch-364
577
    inventory = property(read_working_inventory, _write_inventory, None,
578
                         """Inventory for the working copy.""")
579
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
580
    def add(self, files, ids=None):
1 by mbp at sourcefrog
import from baz patch-364
581
        """Make files versioned.
582
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
583
        Note that the command line normally calls smart_add instead,
584
        which can automatically recurse.
247 by mbp at sourcefrog
doc
585
1 by mbp at sourcefrog
import from baz patch-364
586
        This puts the files in the Added state, so that they will be
587
        recorded by the next commit.
588
596 by Martin Pool
doc
589
        files
590
            List of paths to add, relative to the base of the tree.
591
592
        ids
593
            If set, use these instead of automatically generated ids.
594
            Must be the same length as the list of files, but may
595
            contain None for ids that are to be autogenerated.
596
254 by Martin Pool
- Doc cleanups from Magnus Therning
597
        TODO: Perhaps have an option to add the ids even if the files do
596 by Martin Pool
doc
598
              not (yet) exist.
1 by mbp at sourcefrog
import from baz patch-364
599
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
600
        TODO: Perhaps yield the ids and paths as they're added.
1 by mbp at sourcefrog
import from baz patch-364
601
        """
602
        # TODO: Re-adding a file that is removed in the working copy
603
        # should probably put it back with the previous ID.
800 by Martin Pool
Merge John's import-speedup branch:
604
        if isinstance(files, basestring):
605
            assert(ids is None or isinstance(ids, basestring))
1 by mbp at sourcefrog
import from baz patch-364
606
            files = [files]
493 by Martin Pool
- Merge aaron's merge command
607
            if ids is not None:
608
                ids = [ids]
609
610
        if ids is None:
611
            ids = [None] * len(files)
612
        else:
613
            assert(len(ids) == len(files))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
614
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
615
        self.lock_write()
616
        try:
617
            inv = self.read_working_inventory()
618
            for f,file_id in zip(files, ids):
619
                if is_control_file(f):
620
                    raise BzrError("cannot add control file %s" % quotefn(f))
621
622
                fp = splitpath(f)
623
624
                if len(fp) == 0:
625
                    raise BzrError("cannot add top-level %r" % f)
626
627
                fullpath = os.path.normpath(self.abspath(f))
628
629
                try:
630
                    kind = file_kind(fullpath)
631
                except OSError:
632
                    # maybe something better?
1092.2.6 by Robert Collins
symlink support updated to work
633
                    raise BzrError('cannot add: not a regular file, symlink or directory: %s' % quotefn(f))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
634
1399.1.1 by Robert Collins
move checks for versionability of file kinds into InventoryEntry
635
                if not InventoryEntry.versionable_kind(kind):
636
                    raise BzrError('cannot add: not a versionable file ('
637
                                   'i.e. regular file, symlink or directory): %s' % quotefn(f))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
638
639
                if file_id is None:
640
                    file_id = gen_file_id(f)
641
                inv.add_path(f, kind=kind, file_id=file_id)
642
643
                mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
644
645
            self._write_inventory(inv)
646
        finally:
647
            self.unlock()
70 by mbp at sourcefrog
Prepare for smart recursive add.
648
            
1 by mbp at sourcefrog
import from baz patch-364
649
176 by mbp at sourcefrog
New cat command contributed by janmar.
650
    def print_file(self, file, revno):
651
        """Print `file` to stdout."""
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
652
        self.lock_read()
653
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
654
            tree = self.revision_tree(self.get_rev_id(revno))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
655
            # use inventory as it was in that revision
656
            file_id = tree.inventory.path2id(file)
657
            if not file_id:
897 by Martin Pool
- merge john's revision-naming code
658
                raise BzrError("%r is not present in revision %s" % (file, revno))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
659
            tree.print_file(file_id)
660
        finally:
661
            self.unlock()
662
663
1 by mbp at sourcefrog
import from baz patch-364
664
    def remove(self, files, verbose=False):
665
        """Mark nominated files for removal from the inventory.
666
667
        This does not remove their text.  This does not run on 
668
254 by Martin Pool
- Doc cleanups from Magnus Therning
669
        TODO: Refuse to remove modified files unless --force is given?
1 by mbp at sourcefrog
import from baz patch-364
670
254 by Martin Pool
- Doc cleanups from Magnus Therning
671
        TODO: Do something useful with directories.
1 by mbp at sourcefrog
import from baz patch-364
672
254 by Martin Pool
- Doc cleanups from Magnus Therning
673
        TODO: Should this remove the text or not?  Tough call; not
1 by mbp at sourcefrog
import from baz patch-364
674
        removing may be useful and the user can just use use rm, and
675
        is the opposite of add.  Removing it is consistent with most
676
        other tools.  Maybe an option.
677
        """
678
        ## TODO: Normalize names
679
        ## TODO: Remove nested loops; better scalability
800 by Martin Pool
Merge John's import-speedup branch:
680
        if isinstance(files, basestring):
1 by mbp at sourcefrog
import from baz patch-364
681
            files = [files]
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
682
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
683
        self.lock_write()
684
685
        try:
686
            tree = self.working_tree()
687
            inv = tree.inventory
688
689
            # do this before any modifications
690
            for f in files:
691
                fid = inv.path2id(f)
692
                if not fid:
693
                    raise BzrError("cannot remove unversioned file %s" % quotefn(f))
694
                mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
695
                if verbose:
696
                    # having remove it, it must be either ignored or unknown
697
                    if tree.is_ignored(f):
698
                        new_status = 'I'
699
                    else:
700
                        new_status = '?'
701
                    show_status(new_status, inv[fid].kind, quotefn(f))
702
                del inv[fid]
703
704
            self._write_inventory(inv)
705
        finally:
706
            self.unlock()
707
612 by Martin Pool
doc
708
    # FIXME: this doesn't need to be a branch method
493 by Martin Pool
- Merge aaron's merge command
709
    def set_inventory(self, new_inventory_list):
800 by Martin Pool
Merge John's import-speedup branch:
710
        from bzrlib.inventory import Inventory, InventoryEntry
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
711
        inv = Inventory(self.get_root_id())
493 by Martin Pool
- Merge aaron's merge command
712
        for path, file_id, parent, kind in new_inventory_list:
713
            name = os.path.basename(path)
714
            if name == "":
715
                continue
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
716
            # fixme, there should be a factory function inv,add_?? 
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
717
            if kind == 'directory':
718
                inv.add(inventory.InventoryDirectory(file_id, name, parent))
1399.1.9 by Robert Collins
factor out file related logic from InventoryEntry to InventoryFile
719
            elif kind == 'file':
720
                inv.add(inventory.InventoryFile(file_id, name, parent))
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
721
            elif kind == 'symlink':
722
                inv.add(inventory.InventoryLink(file_id, name, parent))
1399.1.8 by Robert Collins
factor out inventory directory logic into 'InventoryDirectory' class
723
            else:
1399.1.10 by Robert Collins
remove kind from the InventoryEntry constructor - only child classes should be created now
724
                raise BzrError("unknown kind %r" % kind)
493 by Martin Pool
- Merge aaron's merge command
725
        self._write_inventory(inv)
726
1 by mbp at sourcefrog
import from baz patch-364
727
    def unknowns(self):
728
        """Return all unknown files.
729
730
        These are files in the working directory that are not versioned or
731
        control files or ignored.
732
        
733
        >>> b = ScratchBranch(files=['foo', 'foo~'])
734
        >>> list(b.unknowns())
735
        ['foo']
736
        >>> b.add('foo')
737
        >>> list(b.unknowns())
738
        []
739
        >>> b.remove('foo')
740
        >>> list(b.unknowns())
741
        ['foo']
742
        """
743
        return self.working_tree().unknowns()
744
745
905 by Martin Pool
- merge aaron's append_multiple.patch
746
    def append_revision(self, *revision_ids):
747
        for revision_id in revision_ids:
748
            mutter("add {%s} to revision-history" % revision_id)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
749
        self.lock_write()
769 by Martin Pool
- append to branch revision history using AtomicFile
750
        try:
1393.1.22 by Martin Pool
- clean up Branch.append_revision()
751
            rev_history = self.revision_history()
752
            rev_history.extend(revision_ids)
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
753
            self.put_controlfile('revision-history', '\n'.join(rev_history))
769 by Martin Pool
- append to branch revision history using AtomicFile
754
        finally:
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
755
            self.unlock()
233 by mbp at sourcefrog
- more output from test.sh
756
1261 by Martin Pool
- new method Branch.has_revision
757
    def has_revision(self, revision_id):
758
        """True if this branch has a copy of the revision.
759
760
        This does not necessarily imply the revision is merge
761
        or on the mainline."""
1390 by Robert Collins
pair programming worx... merge integration and weave
762
        return (revision_id is None
763
                or revision_id in self.revision_store)
1261 by Martin Pool
- new method Branch.has_revision
764
1182 by Martin Pool
- more disentangling of xml storage format from objects
765
    def get_revision_xml_file(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
766
        """Return XML file object for revision object."""
767
        if not revision_id or not isinstance(revision_id, basestring):
768
            raise InvalidRevisionId(revision_id)
769
770
        self.lock_read()
771
        try:
772
            try:
773
                return self.revision_store[revision_id]
1185.1.18 by Robert Collins
Lalo Martins remotebranch patch
774
            except (IndexError, KeyError):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
775
                raise bzrlib.errors.NoSuchRevision(self, revision_id)
776
        finally:
777
            self.unlock()
778
1182 by Martin Pool
- more disentangling of xml storage format from objects
779
    #deprecated
780
    get_revision_xml = get_revision_xml_file
781
1231 by Martin Pool
- more progress on fetch on top of weaves
782
    def get_revision_xml(self, revision_id):
783
        return self.get_revision_xml_file(revision_id).read()
784
785
1 by mbp at sourcefrog
import from baz patch-364
786
    def get_revision(self, revision_id):
787
        """Return the Revision object for a named revision"""
1182 by Martin Pool
- more disentangling of xml storage format from objects
788
        xml_file = self.get_revision_xml_file(revision_id)
1027 by Martin Pool
- better error message when failing to get revision from store
789
790
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
791
            r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
792
        except SyntaxError, e:
793
            raise bzrlib.errors.BzrError('failed to unpack revision_xml',
794
                                         [revision_id,
795
                                          str(e)])
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
796
            
1 by mbp at sourcefrog
import from baz patch-364
797
        assert r.revision_id == revision_id
798
        return r
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
799
800
    def get_revision_delta(self, revno):
801
        """Return the delta for one revision.
802
803
        The delta is relative to its mainline predecessor, or the
804
        empty tree for revision 1.
805
        """
806
        assert isinstance(revno, int)
807
        rh = self.revision_history()
808
        if not (1 <= revno <= len(rh)):
809
            raise InvalidRevisionNumber(revno)
810
811
        # revno is 1-based; list is 0-based
812
813
        new_tree = self.revision_tree(rh[revno-1])
814
        if revno == 1:
815
            old_tree = EmptyTree()
816
        else:
817
            old_tree = self.revision_tree(rh[revno-2])
818
819
        return compare_trees(old_tree, new_tree)
820
672 by Martin Pool
- revision records include the hash of their inventory and
821
    def get_revision_sha1(self, revision_id):
822
        """Hash the stored value of a revision, and return it."""
823
        # In the future, revision entries will be signed. At that
824
        # point, it is probably best *not* to include the signature
825
        # in the revision hash. Because that lets you re-sign
826
        # the revision, (add signatures/remove signatures) and still
827
        # have all hash pointers stay consistent.
828
        # But for now, just hash the contents.
1230 by Martin Pool
- remove Branch.get_revision_xml; use get_revision_xml_file instead
829
        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
830
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
831
    def get_ancestry(self, revision_id):
1415 by Robert Collins
remove the ancestry weave file
832
        """Return a list of revision-ids integrated by a revision.
833
        
834
        This currently returns a list, but the ordering is not guaranteed:
835
        treat it as a set.
836
        """
1390 by Robert Collins
pair programming worx... merge integration and weave
837
        if revision_id is None:
838
            return [None]
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
839
        w = self.get_inventory_weave()
1415 by Robert Collins
remove the ancestry weave file
840
        return [None] + map(w.idx_to_name,
841
                            w.inclusions([w.lookup(revision_id)]))
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
842
1223 by Martin Pool
- store inventories in weave
843
    def get_inventory_weave(self):
1417.1.8 by Robert Collins
use transactions in the weave store interface, which enables caching for log
844
        return self.control_weaves.get_weave('inventory',
845
                                             self.get_transaction())
1223 by Martin Pool
- store inventories in weave
846
1192 by Martin Pool
- clean up code for retrieving stored inventories
847
    def get_inventory(self, revision_id):
1223 by Martin Pool
- store inventories in weave
848
        """Get Inventory object by hash."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
849
        xml = self.get_inventory_xml(revision_id)
850
        return bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
851
1192 by Martin Pool
- clean up code for retrieving stored inventories
852
    def get_inventory_xml(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
853
        """Get inventory XML as a file object."""
1192 by Martin Pool
- clean up code for retrieving stored inventories
854
        try:
855
            assert isinstance(revision_id, basestring), type(revision_id)
1223 by Martin Pool
- store inventories in weave
856
            iw = self.get_inventory_weave()
857
            return iw.get_text(iw.lookup(revision_id))
1192 by Martin Pool
- clean up code for retrieving stored inventories
858
        except IndexError:
859
            raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
860
1192 by Martin Pool
- clean up code for retrieving stored inventories
861
    def get_inventory_sha1(self, revision_id):
672 by Martin Pool
- revision records include the hash of their inventory and
862
        """Return the sha1 hash of the inventory entry
863
        """
1223 by Martin Pool
- store inventories in weave
864
        return self.get_revision(revision_id).inventory_sha1
672 by Martin Pool
- revision records include the hash of their inventory and
865
1 by mbp at sourcefrog
import from baz patch-364
866
    def get_revision_inventory(self, revision_id):
867
        """Return inventory of a past revision."""
1372 by Martin Pool
- avoid converting inventories to/from StringIO
868
        # TODO: Unify this with get_inventory()
1218 by Martin Pool
- fix up import
869
        # 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
870
        # must be the same as its revision, so this is trivial.
1 by mbp at sourcefrog
import from baz patch-364
871
        if revision_id == None:
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
872
            return Inventory(self.get_root_id())
1 by mbp at sourcefrog
import from baz patch-364
873
        else:
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
874
            return self.get_inventory(revision_id)
1 by mbp at sourcefrog
import from baz patch-364
875
876
    def revision_history(self):
1295 by Martin Pool
- remove pointless doctest
877
        """Return sequence of revision hashes on to this branch."""
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
878
        self.lock_read()
879
        try:
1417.1.12 by Robert Collins
cache revision history during read transactions
880
            transaction = self.get_transaction()
881
            history = transaction.map.find_revision_history()
882
            if history is not None:
883
                mutter("cache hit for revision-history in %s", self)
884
                return list(history)
885
            history = [l.rstrip('\r\n') for l in
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
886
                    self.controlfile('revision-history', 'r').readlines()]
1417.1.12 by Robert Collins
cache revision history during read transactions
887
            transaction.map.add_revision_history(history)
888
            # this call is disabled because revision_history is 
889
            # not really an object yet, and the transaction is for objects.
890
            # transaction.register_clean(history, precious=True)
891
            return list(history)
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
892
        finally:
893
            self.unlock()
1 by mbp at sourcefrog
import from baz patch-364
894
895
    def revno(self):
896
        """Return current revision number for this branch.
897
898
        That is equivalent to the number of revisions committed to
899
        this branch.
900
        """
901
        return len(self.revision_history())
902
903
1241 by Martin Pool
- rename last_patch to last_revision
904
    def last_revision(self):
1 by mbp at sourcefrog
import from baz patch-364
905
        """Return last patch hash, or None if no history.
906
        """
907
        ph = self.revision_history()
908
        if ph:
909
            return ph[-1]
184 by mbp at sourcefrog
pychecker fixups
910
        else:
911
            return None
485 by Martin Pool
- move commit code into its own module
912
913
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
914
    def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
1260 by Martin Pool
- some updates for fetch/update function
915
        """Return a list of new revisions that would perfectly fit.
916
        
628 by Martin Pool
- merge aaron's updated merge/pull code
917
        If self and other have not diverged, return a list of the revisions
918
        present in other, but missing from self.
919
920
        >>> from bzrlib.commit import commit
921
        >>> bzrlib.trace.silent = True
922
        >>> br1 = ScratchBranch()
923
        >>> br2 = ScratchBranch()
924
        >>> br1.missing_revisions(br2)
925
        []
926
        >>> commit(br2, "lala!", rev_id="REVISION-ID-1")
927
        >>> br1.missing_revisions(br2)
928
        [u'REVISION-ID-1']
929
        >>> br2.missing_revisions(br1)
930
        []
931
        >>> commit(br1, "lala!", rev_id="REVISION-ID-1")
932
        >>> br1.missing_revisions(br2)
933
        []
934
        >>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
935
        >>> br1.missing_revisions(br2)
936
        [u'REVISION-ID-2A']
937
        >>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
938
        >>> br1.missing_revisions(br2)
939
        Traceback (most recent call last):
940
        DivergedBranches: These branches have diverged.
941
        """
942
        self_history = self.revision_history()
943
        self_len = len(self_history)
944
        other_history = other.revision_history()
945
        other_len = len(other_history)
946
        common_index = min(self_len, other_len) -1
947
        if common_index >= 0 and \
948
            self_history[common_index] != other_history[common_index]:
949
            raise DivergedBranches(self, other)
685 by Martin Pool
- add -r option to the branch command
950
951
        if stop_revision is None:
952
            stop_revision = other_len
1273 by Martin Pool
- fix up copy_branch, etc
953
        else:
954
            assert isinstance(stop_revision, int)
955
            if stop_revision > other_len:
956
                raise bzrlib.errors.NoSuchRevision(self, stop_revision)
685 by Martin Pool
- add -r option to the branch command
957
        return other_history[self_len:stop_revision]
958
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
959
    def update_revisions(self, other, stop_revision=None):
1390 by Robert Collins
pair programming worx... merge integration and weave
960
        """Pull in new perfect-fit revisions."""
1185.12.22 by aaron.bentley at utoronto
Moved fixme to more appropriate place
961
        # FIXME: If the branches have diverged, but the latest
962
        # revision in this branch is completely merged into the other,
963
        # then we should still be able to pull.
974.1.33 by aaron.bentley at utoronto
Added greedy_fetch to update_revisions
964
        from bzrlib.fetch import greedy_fetch
974.1.74 by Aaron Bentley
Made pull work after remote branch has merged latest revision
965
        from bzrlib.revision import get_intervening_revisions
974.1.75 by Aaron Bentley
Sped up pull by copying locally first
966
        if stop_revision is None:
1390 by Robert Collins
pair programming worx... merge integration and weave
967
            stop_revision = other.last_revision()
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
968
        if (stop_revision is not None and 
969
            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
970
            return
1260 by Martin Pool
- some updates for fetch/update function
971
        greedy_fetch(to_branch=self, from_branch=other,
1261 by Martin Pool
- new method Branch.has_revision
972
                     revision=stop_revision)
1390 by Robert Collins
pair programming worx... merge integration and weave
973
        pullable_revs = self.missing_revisions(
974
            other, other.revision_id_to_revno(stop_revision))
1261 by Martin Pool
- new method Branch.has_revision
975
        if pullable_revs:
976
            greedy_fetch(to_branch=self,
977
                         from_branch=other,
978
                         revision=pullable_revs[-1])
979
            self.append_revision(*pullable_revs)
1390 by Robert Collins
pair programming worx... merge integration and weave
980
    
1110 by Martin Pool
- merge aaron's merge improvements:
981
485 by Martin Pool
- move commit code into its own module
982
    def commit(self, *args, **kw):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
983
        from bzrlib.commit import Commit
984
        Commit().commit(self, *args, **kw)
1390 by Robert Collins
pair programming worx... merge integration and weave
985
    
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
986
    def revision_id_to_revno(self, revision_id):
987
        """Given a revision id, return its revno"""
1390 by Robert Collins
pair programming worx... merge integration and weave
988
        if revision_id is None:
989
            return 0
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
990
        history = self.revision_history()
991
        try:
992
            return history.index(revision_id) + 1
993
        except ValueError:
994
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
995
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
996
    def get_rev_id(self, revno, history=None):
997
        """Find the revision id of the specified revno."""
998
        if revno == 0:
999
            return None
1000
        if history is None:
1001
            history = self.revision_history()
1002
        elif revno <= 0 or revno > len(history):
1003
            raise bzrlib.errors.NoSuchRevision(self, revno)
1004
        return history[revno - 1]
1005
1 by mbp at sourcefrog
import from baz patch-364
1006
    def revision_tree(self, revision_id):
1007
        """Return Tree for a revision on this branch.
1008
1009
        `revision_id` may be None for the null revision, in which case
1010
        an `EmptyTree` is returned."""
529 by Martin Pool
todo
1011
        # TODO: refactor this to use an existing revision object
1012
        # so we don't need to read it in twice.
1 by mbp at sourcefrog
import from baz patch-364
1013
        if revision_id == None:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1014
            return EmptyTree()
1 by mbp at sourcefrog
import from baz patch-364
1015
        else:
1016
            inv = self.get_revision_inventory(revision_id)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
1017
            return RevisionTree(self.weave_store, inv, revision_id)
1 by mbp at sourcefrog
import from baz patch-364
1018
1019
1020
    def working_tree(self):
1021
        """Return a `Tree` for the working copy."""
1185.2.2 by Lalo Martins
cleaning up and refactoring the branch module.
1022
        from bzrlib.workingtree import WorkingTree
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
1023
        # TODO: In the future, WorkingTree should utilize Transport
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1024
        # RobertCollins 20051003 - I don't think it should - working trees are
1025
        # much more complex to keep consistent than our careful .bzr subset.
1026
        # instead, we should say that working trees are local only, and optimise
1027
        # for that.
907.1.5 by John Arbash Meinel
Some more work, including ScratchBranch changes.
1028
        return WorkingTree(self._transport.base, self.read_working_inventory())
1 by mbp at sourcefrog
import from baz patch-364
1029
1030
1031
    def basis_tree(self):
1032
        """Return `Tree` object for last revision.
1033
1034
        If there are no revisions yet, return an `EmptyTree`.
1035
        """
1241 by Martin Pool
- rename last_patch to last_revision
1036
        return self.revision_tree(self.last_revision())
1 by mbp at sourcefrog
import from baz patch-364
1037
1038
168 by mbp at sourcefrog
new "rename" command
1039
    def rename_one(self, from_rel, to_rel):
309 by Martin Pool
doc
1040
        """Rename one file.
1041
1042
        This can change the directory or the filename or both.
353 by Martin Pool
- Per-branch locks in read and write modes.
1043
        """
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1044
        self.lock_write()
171 by mbp at sourcefrog
better error message when working file rename fails
1045
        try:
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1046
            tree = self.working_tree()
1047
            inv = tree.inventory
1048
            if not tree.has_filename(from_rel):
1049
                raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1050
            if tree.has_filename(to_rel):
1051
                raise BzrError("can't rename: new working file %r already exists" % to_rel)
1052
1053
            file_id = inv.path2id(from_rel)
1054
            if file_id == None:
1055
                raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1056
1057
            if inv.path2id(to_rel):
1058
                raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1059
1060
            to_dir, to_tail = os.path.split(to_rel)
1061
            to_dir_id = inv.path2id(to_dir)
1062
            if to_dir_id == None and to_dir != '':
1063
                raise BzrError("can't determine destination directory id for %r" % to_dir)
1064
1065
            mutter("rename_one:")
1066
            mutter("  file_id    {%s}" % file_id)
1067
            mutter("  from_rel   %r" % from_rel)
1068
            mutter("  to_rel     %r" % to_rel)
1069
            mutter("  to_dir     %r" % to_dir)
1070
            mutter("  to_dir_id  {%s}" % to_dir_id)
1071
1072
            inv.rename(file_id, to_dir_id, to_tail)
1073
1074
            from_abs = self.abspath(from_rel)
1075
            to_abs = self.abspath(to_rel)
1076
            try:
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1077
                rename(from_abs, to_abs)
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1078
            except OSError, e:
1079
                raise BzrError("failed to rename %r to %r: %s"
1080
                        % (from_abs, to_abs, e[1]),
1081
                        ["rename rolled back"])
1082
1083
            self._write_inventory(inv)
1084
        finally:
1085
            self.unlock()
1086
1087
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
1088
    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
1089
        """Rename files.
1090
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
1091
        to_name must exist as a versioned directory.
1092
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
1093
        If to_name exists and is a directory, the files are moved into
1094
        it, keeping their old names.  If it is a directory, 
1095
1096
        Note that to_name is only the last component of the new name;
1097
        this doesn't change the directory.
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1098
1099
        This returns a list of (from_path, to_path) pairs for each
1100
        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
1101
        """
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1102
        result = []
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1103
        self.lock_write()
1104
        try:
1105
            ## TODO: Option to move IDs only
1106
            assert not isinstance(from_paths, basestring)
1107
            tree = self.working_tree()
1108
            inv = tree.inventory
1109
            to_abs = self.abspath(to_name)
1110
            if not isdir(to_abs):
1111
                raise BzrError("destination %r is not a directory" % to_abs)
1112
            if not tree.has_filename(to_name):
1113
                raise BzrError("destination %r not in working directory" % to_abs)
1114
            to_dir_id = inv.path2id(to_name)
1115
            if to_dir_id == None and to_name != '':
1116
                raise BzrError("destination %r is not a versioned directory" % to_name)
1117
            to_dir_ie = inv[to_dir_id]
1118
            if to_dir_ie.kind not in ('directory', 'root_directory'):
1119
                raise BzrError("destination %r is not a directory" % to_abs)
1120
1121
            to_idpath = inv.get_idpath(to_dir_id)
1122
1123
            for f in from_paths:
1124
                if not tree.has_filename(f):
1125
                    raise BzrError("%r does not exist in working tree" % f)
1126
                f_id = inv.path2id(f)
1127
                if f_id == None:
1128
                    raise BzrError("%r is not versioned" % f)
1129
                name_tail = splitpath(f)[-1]
1130
                dest_path = appendpath(to_name, name_tail)
1131
                if tree.has_filename(dest_path):
1132
                    raise BzrError("destination %r already exists" % dest_path)
1133
                if f_id in to_idpath:
1134
                    raise BzrError("can't move %r to a subdirectory of itself" % f)
1135
1136
            # OK, so there's a race here, it's possible that someone will
1137
            # create a file in this interval and then the rename might be
1138
            # left half-done.  But we should have caught most problems.
1139
1140
            for f in from_paths:
1141
                name_tail = splitpath(f)[-1]
1142
                dest_path = appendpath(to_name, name_tail)
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1143
                result.append((f, dest_path))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1144
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
1145
                try:
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1146
                    rename(self.abspath(f), self.abspath(dest_path))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1147
                except OSError, e:
1148
                    raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1149
                            ["rename rolled back"])
1150
1151
            self._write_inventory(inv)
1152
        finally:
1153
            self.unlock()
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
1154
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1155
        return result
1156
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
1157
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1158
    def revert(self, filenames, old_tree=None, backups=True):
778 by Martin Pool
- simple revert of text files
1159
        """Restore selected files to the versions from a previous tree.
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1160
1161
        backups
1162
            If true (default) backups are made of files before
1163
            they're renamed.
778 by Martin Pool
- simple revert of text files
1164
        """
1165
        from bzrlib.errors import NotVersionedError, BzrError
1166
        from bzrlib.atomicfile import AtomicFile
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1167
        from bzrlib.osutils import backup_file
778 by Martin Pool
- simple revert of text files
1168
        
1169
        inv = self.read_working_inventory()
1170
        if old_tree is None:
1171
            old_tree = self.basis_tree()
1172
        old_inv = old_tree.inventory
1173
1174
        nids = []
1175
        for fn in filenames:
1176
            file_id = inv.path2id(fn)
1177
            if not file_id:
1178
                raise NotVersionedError("not a versioned file", fn)
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1179
            if not old_inv.has_id(file_id):
1180
                raise BzrError("file not present in old tree", fn, file_id)
778 by Martin Pool
- simple revert of text files
1181
            nids.append((fn, file_id))
1182
            
1183
        # TODO: Rename back if it was previously at a different location
1184
1185
        # TODO: If given a directory, restore the entire contents from
1186
        # the previous version.
1187
1188
        # TODO: Make a backup to a temporary file.
1189
1190
        # TODO: If the file previously didn't exist, delete it?
1191
        for fn, file_id in nids:
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1192
            backup_file(fn)
1193
            
778 by Martin Pool
- simple revert of text files
1194
            f = AtomicFile(fn, 'wb')
1195
            try:
1196
                f.write(old_tree.get_file(file_id).read())
1197
                f.commit()
1198
            finally:
1199
                f.close()
1200
1201
815 by Martin Pool
- track pending-merges
1202
    def pending_merges(self):
1203
        """Return a list of pending merges.
1204
1205
        These are revisions that have been merged into the working
1206
        directory but not yet committed.
1207
        """
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1208
        cfn = self._rel_controlfilename('pending-merges')
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1209
        if not self._transport.has(cfn):
815 by Martin Pool
- track pending-merges
1210
            return []
1211
        p = []
1212
        for l in self.controlfile('pending-merges', 'r').readlines():
1213
            p.append(l.rstrip('\n'))
1214
        return p
1215
1216
907.1.4 by John Arbash Meinel
Add pending_merge can take multiple entries.
1217
    def add_pending_merge(self, *revision_ids):
1263 by Martin Pool
- clean up imports
1218
        # TODO: Perhaps should check at this point that the
1219
        # history of the revision is actually present?
815 by Martin Pool
- track pending-merges
1220
        p = self.pending_merges()
907.1.4 by John Arbash Meinel
Add pending_merge can take multiple entries.
1221
        updated = False
1222
        for rev_id in revision_ids:
1223
            if rev_id in p:
1224
                continue
1225
            p.append(rev_id)
1226
            updated = True
1227
        if updated:
1228
            self.set_pending_merges(p)
815 by Martin Pool
- track pending-merges
1229
1230
    def set_pending_merges(self, rev_list):
1231
        self.lock_write()
1232
        try:
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
1233
            self.put_controlfile('pending-merges', '\n'.join(rev_list))
815 by Martin Pool
- track pending-merges
1234
        finally:
1235
            self.unlock()
1236
1237
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1238
    def get_parent(self):
1239
        """Return the parent location of the branch.
1240
1241
        This is the default location for push/pull/missing.  The usual
1242
        pattern is that the user can override it by specifying a
1243
        location.
1244
        """
1245
        import errno
1246
        _locs = ['parent', 'pull', 'x-pull']
1247
        for l in _locs:
1248
            try:
1249
                return self.controlfile(l, 'r').read().strip('\n')
1250
            except IOError, e:
1251
                if e.errno != errno.ENOENT:
1252
                    raise
1253
        return None
1254
1150 by Martin Pool
- add new Branch.set_parent and tests
1255
1256
    def set_parent(self, url):
1257
        # TODO: Maybe delete old location files?
1258
        from bzrlib.atomicfile import AtomicFile
1259
        self.lock_write()
1260
        try:
1261
            f = AtomicFile(self.controlfilename('parent'))
1262
            try:
1263
                f.write(url + '\n')
1264
                f.commit()
1265
            finally:
1266
                f.close()
1267
        finally:
1268
            self.unlock()
1269
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
1270
    def check_revno(self, revno):
1271
        """\
1272
        Check whether a revno corresponds to any revision.
1273
        Zero (the NULL revision) is considered valid.
1274
        """
1275
        if revno != 0:
1276
            self.check_real_revno(revno)
1277
            
1278
    def check_real_revno(self, revno):
1279
        """\
1280
        Check whether a revno corresponds to a real revision.
1281
        Zero (the NULL revision) is considered invalid
1282
        """
1283
        if revno < 1 or revno > self.revno():
1284
            raise InvalidRevisionNumber(revno)
1285
        
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1286
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1287
        
1288
1289
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
1290
class ScratchBranch(_Branch):
1 by mbp at sourcefrog
import from baz patch-364
1291
    """Special test class: a branch that cleans up after itself.
1292
1293
    >>> b = ScratchBranch()
1294
    >>> isdir(b.base)
1295
    True
1296
    >>> bd = b.base
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1297
    >>> b.destroy()
1 by mbp at sourcefrog
import from baz patch-364
1298
    >>> isdir(bd)
1299
    False
1300
    """
622 by Martin Pool
Updated merge patch from Aaron
1301
    def __init__(self, files=[], dirs=[], base=None):
1 by mbp at sourcefrog
import from baz patch-364
1302
        """Make a test branch.
1303
1304
        This creates a temporary directory and runs init-tree in it.
1305
1306
        If any files are listed, they are created in the working copy.
1307
        """
800 by Martin Pool
Merge John's import-speedup branch:
1308
        from tempfile import mkdtemp
622 by Martin Pool
Updated merge patch from Aaron
1309
        init = False
1310
        if base is None:
800 by Martin Pool
Merge John's import-speedup branch:
1311
            base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1312
            init = True
1393.2.4 by John Arbash Meinel
All tests pass.
1313
        if isinstance(base, basestring):
1314
            base = get_transport(base)
1185.11.11 by John Arbash Meinel
Removing the remotebranch object.
1315
        _Branch.__init__(self, base, init=init)
100 by mbp at sourcefrog
- add test case for ignore files
1316
        for d in dirs:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1317
            self._transport.mkdir(d)
100 by mbp at sourcefrog
- add test case for ignore files
1318
            
1 by mbp at sourcefrog
import from baz patch-364
1319
        for f in files:
907.1.8 by John Arbash Meinel
Changed the format for abspath. Updated branch to use a hidden _transport
1320
            self._transport.put(f, 'content of %s' % f)
1 by mbp at sourcefrog
import from baz patch-364
1321
1322
622 by Martin Pool
Updated merge patch from Aaron
1323
    def clone(self):
1324
        """
1325
        >>> orig = ScratchBranch(files=["file1", "file2"])
1326
        >>> clone = orig.clone()
1185.1.40 by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch.
1327
        >>> if os.name != 'nt':
1328
        ...   os.path.samefile(orig.base, clone.base)
1329
        ... else:
1330
        ...   orig.base == clone.base
1331
        ...
622 by Martin Pool
Updated merge patch from Aaron
1332
        False
1333
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
1334
        True
1335
        """
800 by Martin Pool
Merge John's import-speedup branch:
1336
        from shutil import copytree
1337
        from tempfile import mkdtemp
1338
        base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1339
        os.rmdir(base)
800 by Martin Pool
Merge John's import-speedup branch:
1340
        copytree(self.base, base, symlinks=True)
622 by Martin Pool
Updated merge patch from Aaron
1341
        return ScratchBranch(base=base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1342
1 by mbp at sourcefrog
import from baz patch-364
1343
    def __del__(self):
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1344
        self.destroy()
1345
1346
    def destroy(self):
1 by mbp at sourcefrog
import from baz patch-364
1347
        """Destroy the test branch, removing the scratch directory."""
800 by Martin Pool
Merge John's import-speedup branch:
1348
        from shutil import rmtree
163 by mbp at sourcefrog
merge win32 portability fixes
1349
        try:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
1350
            if self.base:
1351
                mutter("delete ScratchBranch %s" % self.base)
800 by Martin Pool
Merge John's import-speedup branch:
1352
                rmtree(self.base)
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1353
        except OSError, e:
163 by mbp at sourcefrog
merge win32 portability fixes
1354
            # Work around for shutil.rmtree failing on Windows when
1355
            # readonly files are encountered
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1356
            mutter("hit exception in destroying ScratchBranch: %s" % e)
163 by mbp at sourcefrog
merge win32 portability fixes
1357
            for root, dirs, files in os.walk(self.base, topdown=False):
1358
                for name in files:
1359
                    os.chmod(os.path.join(root, name), 0700)
800 by Martin Pool
Merge John's import-speedup branch:
1360
            rmtree(self.base)
907.1.19 by John Arbash Meinel
Updated ScratchBranch and Branch.base, All Tests PASS !!!
1361
        self._transport = None
1 by mbp at sourcefrog
import from baz patch-364
1362
1363
    
1364
1365
######################################################################
1366
# predicates
1367
1368
1369
def is_control_file(filename):
1370
    ## FIXME: better check
1371
    filename = os.path.normpath(filename)
1372
    while filename != '':
1373
        head, tail = os.path.split(filename)
1374
        ## mutter('check %r for control file' % ((head, tail), ))
1375
        if tail == bzrlib.BZRDIR:
1376
            return True
70 by mbp at sourcefrog
Prepare for smart recursive add.
1377
        if filename == head:
1378
            break
1 by mbp at sourcefrog
import from baz patch-364
1379
        filename = head
1380
    return False
1381
1382
1383
70 by mbp at sourcefrog
Prepare for smart recursive add.
1384
def gen_file_id(name):
1 by mbp at sourcefrog
import from baz patch-364
1385
    """Return new file id.
1386
1387
    This should probably generate proper UUIDs, but for the moment we
1388
    cope with just randomness because running uuidgen every time is
1389
    slow."""
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1390
    import re
800 by Martin Pool
Merge John's import-speedup branch:
1391
    from binascii import hexlify
1392
    from time import time
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1393
1394
    # get last component
70 by mbp at sourcefrog
Prepare for smart recursive add.
1395
    idx = name.rfind('/')
1396
    if idx != -1:
1397
        name = name[idx+1 : ]
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
1398
    idx = name.rfind('\\')
1399
    if idx != -1:
1400
        name = name[idx+1 : ]
70 by mbp at sourcefrog
Prepare for smart recursive add.
1401
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1402
    # make it not a hidden file
70 by mbp at sourcefrog
Prepare for smart recursive add.
1403
    name = name.lstrip('.')
1404
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1405
    # remove any wierd characters; we don't escape them but rather
1406
    # just pull them out
1407
    name = re.sub(r'[^\w.]', '', name)
1408
190 by mbp at sourcefrog
64 bits of randomness in file/revision ids
1409
    s = hexlify(rand_bytes(8))
800 by Martin Pool
Merge John's import-speedup branch:
1410
    return '-'.join((name, compact_date(time()), s))
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1411
1412
1413
def gen_root_id():
1414
    """Return a new tree-root file id."""
1415
    return gen_file_id('TREE_ROOT')
1416
1092.1.34 by Robert Collins
unbreak cmd_branch now that something tests the core of it..
1417