/brz/remove-bazaar

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