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