~bzr-pqm/bzr/bzr.dev

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