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