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