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