~bzr-pqm/bzr/bzr.dev

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