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