/brz/remove-bazaar

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