/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
1 by mbp at sourcefrog
import from baz patch-364
20
21
import bzrlib
800 by Martin Pool
Merge John's import-speedup branch:
22
from bzrlib.trace import mutter, note
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
23
from bzrlib.osutils import isdir, quotefn, compact_date, rand_bytes, \
24
     splitpath, \
800 by Martin Pool
Merge John's import-speedup branch:
25
     sha_file, appendpath, file_kind
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
26
1192 by Martin Pool
- clean up code for retrieving stored inventories
27
from bzrlib.errors import (BzrError, InvalidRevisionNumber, InvalidRevisionId,
28
                           NoSuchRevision)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
29
from bzrlib.textui import show_status
30
from bzrlib.revision import Revision
31
from bzrlib.delta import compare_trees
32
from bzrlib.tree import EmptyTree, RevisionTree
1192 by Martin Pool
- clean up code for retrieving stored inventories
33
from bzrlib.inventory import Inventory
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
34
from bzrlib.weavestore import WeaveStore
1189 by Martin Pool
- BROKEN: partial support for commit into weave
35
import bzrlib.xml5
1104 by Martin Pool
- Add a simple UIFactory
36
import bzrlib.ui
37
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
38
1110 by Martin Pool
- merge aaron's merge improvements:
39
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
40
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
41
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1 by mbp at sourcefrog
import from baz patch-364
42
## TODO: Maybe include checks for common corruption of newlines, etc?
43
44
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
45
# TODO: Some operations like log might retrieve the same revisions
46
# repeatedly to calculate deltas.  We could perhaps have a weakref
47
# cache in memory to make this faster.
48
49
# TODO: please move the revision-string syntax stuff out of the branch
50
# object; it's clutter
51
1 by mbp at sourcefrog
import from baz patch-364
52
416 by Martin Pool
- bzr log and bzr root now accept an http URL
53
def find_branch(f, **args):
455 by Martin Pool
- fix 'bzr root'
54
    if f and (f.startswith('http://') or f.startswith('https://')):
416 by Martin Pool
- bzr log and bzr root now accept an http URL
55
        import remotebranch 
56
        return remotebranch.RemoteBranch(f, **args)
57
    else:
58
        return Branch(f, **args)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
59
60
790 by Martin Pool
Merge from aaron:
61
def find_cached_branch(f, cache_root, **args):
62
    from remotebranch import RemoteBranch
63
    br = find_branch(f, **args)
64
    def cacheify(br, store_name):
65
        from meta_store import CachedStore
66
        cache_path = os.path.join(cache_root, store_name)
67
        os.mkdir(cache_path)
68
        new_store = CachedStore(getattr(br, store_name), cache_path)
69
        setattr(br, store_name, new_store)
70
71
    if isinstance(br, RemoteBranch):
72
        cacheify(br, 'inventory_store')
73
        cacheify(br, 'text_store')
74
        cacheify(br, 'revision_store')
75
    return br
76
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
77
600 by Martin Pool
- Better Branch.relpath that doesn't match on
78
def _relpath(base, path):
79
    """Return path relative to base, or raise exception.
80
81
    The path may be either an absolute path or a path relative to the
82
    current working directory.
83
84
    Lifted out of Branch.relpath for ease of testing.
85
86
    os.path.commonprefix (python2.4) has a bad bug that it works just
87
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
88
    avoids that problem."""
89
    rp = os.path.abspath(path)
90
91
    s = []
92
    head = rp
93
    while len(head) >= len(base):
94
        if head == base:
95
            break
96
        head, tail = os.path.split(head)
97
        if tail:
98
            s.insert(0, tail)
99
    else:
100
        from errors import NotBranchError
101
        raise NotBranchError("path %r is not within branch %r" % (rp, base))
102
103
    return os.sep.join(s)
416 by Martin Pool
- bzr log and bzr root now accept an http URL
104
        
105
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
106
def find_branch_root(f=None):
107
    """Find the branch root enclosing f, or pwd.
108
416 by Martin Pool
- bzr log and bzr root now accept an http URL
109
    f may be a filename or a URL.
110
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
111
    It is not necessary that f exists.
112
113
    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
114
    run into the root.  If there isn't one, raises NotBranchError.
115
    """
184 by mbp at sourcefrog
pychecker fixups
116
    if f == None:
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
117
        f = os.getcwd()
118
    elif hasattr(os.path, 'realpath'):
119
        f = os.path.realpath(f)
120
    else:
121
        f = os.path.abspath(f)
425 by Martin Pool
- check from aaron for existence of a branch
122
    if not os.path.exists(f):
123
        raise BzrError('%r does not exist' % f)
124
        
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
125
126
    orig_f = f
127
128
    while True:
129
        if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
130
            return f
131
        head, tail = os.path.split(f)
132
        if head == f:
133
            # reached the root, whatever that may be
1097 by Martin Pool
- send trace messages out through python logging module
134
            raise bzrlib.errors.NotBranchError('%s is not in a branch' % orig_f)
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
135
        f = head
1074 by Martin Pool
- check for email address in BRANCH_ROOT/.bzr/email, so you can
136
137
138
139
# XXX: move into bzrlib.errors; subclass BzrError    
628 by Martin Pool
- merge aaron's updated merge/pull code
140
class DivergedBranches(Exception):
141
    def __init__(self, branch1, branch2):
142
        self.branch1 = branch1
143
        self.branch2 = branch2
144
        Exception.__init__(self, "These branches have diverged.")
1 by mbp at sourcefrog
import from baz patch-364
145
685 by Martin Pool
- add -r option to the branch command
146
1 by mbp at sourcefrog
import from baz patch-364
147
######################################################################
148
# branch objects
149
558 by Martin Pool
- All top-level classes inherit from object
150
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
151
    """Branch holding a history of revisions.
152
343 by Martin Pool
doc
153
    base
154
        Base directory of the branch.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
155
156
    _lock_mode
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
157
        None, or 'r' or 'w'
158
159
    _lock_count
160
        If _lock_mode is true, a positive count of the number of times the
161
        lock has been taken.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
162
614 by Martin Pool
- unify two defintions of LockError
163
    _lock
164
        Lock object from bzrlib.lock.
1 by mbp at sourcefrog
import from baz patch-364
165
    """
564 by Martin Pool
- Set Branch.base in class def to avoid it being undefined
166
    base = None
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
167
    _lock_mode = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
168
    _lock_count = None
615 by Martin Pool
Major rework of locking code:
169
    _lock = None
353 by Martin Pool
- Per-branch locks in read and write modes.
170
    
897 by Martin Pool
- merge john's revision-naming code
171
    # Map some sort of prefix into a namespace
172
    # stuff like "revno:10", "revid:", etc.
173
    # This should match a prefix with a function which accepts
174
    REVISION_NAMESPACES = {}
175
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
176
    def __init__(self, base, init=False, find_root=True):
1 by mbp at sourcefrog
import from baz patch-364
177
        """Create new branch object at a particular location.
178
254 by Martin Pool
- Doc cleanups from Magnus Therning
179
        base -- Base directory for the branch.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
180
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
181
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
182
             unversioned directory.  If False, the branch must already
183
             be versioned.
184
254 by Martin Pool
- Doc cleanups from Magnus Therning
185
        find_root -- If true and init is false, find the root of the
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
186
             existing branch containing base.
187
1 by mbp at sourcefrog
import from baz patch-364
188
        In the test suite, creation of new trees is tested using the
189
        `ScratchBranch` class.
190
        """
800 by Martin Pool
Merge John's import-speedup branch:
191
        from bzrlib.store import ImmutableStore
1 by mbp at sourcefrog
import from baz patch-364
192
        if init:
64 by mbp at sourcefrog
- fix up init command for new find-branch-root function
193
            self.base = os.path.realpath(base)
1 by mbp at sourcefrog
import from baz patch-364
194
            self._make_control()
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
195
        elif find_root:
196
            self.base = find_branch_root(base)
1 by mbp at sourcefrog
import from baz patch-364
197
        else:
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
198
            self.base = os.path.realpath(base)
1 by mbp at sourcefrog
import from baz patch-364
199
            if not isdir(self.controlfilename('.')):
576 by Martin Pool
- raise exceptions rather than using bailout()
200
                from errors import NotBranchError
201
                raise NotBranchError("not a bzr branch: %s" % quotefn(base),
202
                                     ['use "bzr init" to initialize a new working tree',
203
                                      'current bzr can only operate from top-of-tree'])
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
204
        self._check_format()
1 by mbp at sourcefrog
import from baz patch-364
205
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
206
        self.weave_store = WeaveStore(self.controlfilename('weaves'))
1 by mbp at sourcefrog
import from baz patch-364
207
        self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
208
        self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
209
210
211
    def __str__(self):
212
        return '%s(%r)' % (self.__class__.__name__, self.base)
213
214
215
    __repr__ = __str__
216
217
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
218
    def __del__(self):
615 by Martin Pool
Major rework of locking code:
219
        if self._lock_mode or self._lock:
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
220
            from warnings import warn
221
            warn("branch %r was not explicitly unlocked" % self)
615 by Martin Pool
Major rework of locking code:
222
            self._lock.unlock()
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
223
224
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
225
    def lock_write(self):
226
        if self._lock_mode:
227
            if self._lock_mode != 'w':
228
                from errors import LockError
229
                raise LockError("can't upgrade to a write lock from %r" %
230
                                self._lock_mode)
231
            self._lock_count += 1
232
        else:
615 by Martin Pool
Major rework of locking code:
233
            from bzrlib.lock import WriteLock
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
234
615 by Martin Pool
Major rework of locking code:
235
            self._lock = WriteLock(self.controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
236
            self._lock_mode = 'w'
237
            self._lock_count = 1
238
239
240
    def lock_read(self):
241
        if self._lock_mode:
242
            assert self._lock_mode in ('r', 'w'), \
243
                   "invalid lock mode %r" % self._lock_mode
244
            self._lock_count += 1
245
        else:
615 by Martin Pool
Major rework of locking code:
246
            from bzrlib.lock import ReadLock
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
247
615 by Martin Pool
Major rework of locking code:
248
            self._lock = ReadLock(self.controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
249
            self._lock_mode = 'r'
250
            self._lock_count = 1
251
                        
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
252
    def unlock(self):
253
        if not self._lock_mode:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
254
            from errors import LockError
255
            raise LockError('branch %r is not locked' % (self))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
256
257
        if self._lock_count > 1:
258
            self._lock_count -= 1
259
        else:
615 by Martin Pool
Major rework of locking code:
260
            self._lock.unlock()
261
            self._lock = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
262
            self._lock_mode = self._lock_count = None
353 by Martin Pool
- Per-branch locks in read and write modes.
263
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
264
    def abspath(self, name):
265
        """Return absolute filename for something in the branch"""
1 by mbp at sourcefrog
import from baz patch-364
266
        return os.path.join(self.base, name)
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
267
68 by mbp at sourcefrog
- new relpath command and function
268
    def relpath(self, path):
269
        """Return path relative to this branch of something inside it.
270
271
        Raises an error if path is not in this branch."""
600 by Martin Pool
- Better Branch.relpath that doesn't match on
272
        return _relpath(self.base, path)
68 by mbp at sourcefrog
- new relpath command and function
273
1 by mbp at sourcefrog
import from baz patch-364
274
    def controlfilename(self, file_or_path):
275
        """Return location relative to branch."""
800 by Martin Pool
Merge John's import-speedup branch:
276
        if isinstance(file_or_path, basestring):
1 by mbp at sourcefrog
import from baz patch-364
277
            file_or_path = [file_or_path]
278
        return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
279
280
281
    def controlfile(self, file_or_path, mode='r'):
245 by mbp at sourcefrog
- control files always in utf-8-unix format
282
        """Open a control file for this branch.
283
284
        There are two classes of file in the control directory: text
285
        and binary.  binary files are untranslated byte streams.  Text
286
        control files are stored with Unix newlines and in UTF-8, even
287
        if the platform or locale defaults are different.
430 by Martin Pool
doc
288
289
        Controlfiles should almost never be opened in write mode but
290
        rather should be atomically copied and replaced using atomicfile.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
291
        """
292
293
        fn = self.controlfilename(file_or_path)
294
295
        if mode == 'rb' or mode == 'wb':
296
            return file(fn, mode)
297
        elif mode == 'r' or mode == 'w':
259 by Martin Pool
- use larger file buffers when opening branch control file
298
            # open in binary mode anyhow so there's no newline translation;
299
            # codecs uses line buffering by default; don't want that.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
300
            import codecs
259 by Martin Pool
- use larger file buffers when opening branch control file
301
            return codecs.open(fn, mode + 'b', 'utf-8',
302
                               buffering=60000)
245 by mbp at sourcefrog
- control files always in utf-8-unix format
303
        else:
304
            raise BzrError("invalid controlfile mode %r" % mode)
305
1 by mbp at sourcefrog
import from baz patch-364
306
    def _make_control(self):
307
        os.mkdir(self.controlfilename([]))
308
        self.controlfile('README', 'w').write(
309
            "This is a Bazaar-NG control directory.\n"
679 by Martin Pool
- put trailing newline on newly-created .bzr/README
310
            "Do not change any files in this directory.\n")
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
311
        self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT_5)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
312
        for d in ('text-store', 'inventory-store', 'revision-store',
313
                  'weaves'):
1 by mbp at sourcefrog
import from baz patch-364
314
            os.mkdir(self.controlfilename(d))
315
        for f in ('revision-history', 'merged-patches',
353 by Martin Pool
- Per-branch locks in read and write modes.
316
                  'pending-merged-patches', 'branch-name',
815 by Martin Pool
- track pending-merges
317
                  'branch-lock',
318
                  'pending-merges'):
1 by mbp at sourcefrog
import from baz patch-364
319
            self.controlfile(f, 'w').write('')
320
        mutter('created control directory in ' + self.base)
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
321
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
322
        # if we want per-tree root ids then this is the place to set
323
        # them; they're not needed for now and so ommitted for
324
        # simplicity.
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
325
        f = self.controlfile('inventory','w')
1189 by Martin Pool
- BROKEN: partial support for commit into weave
326
        bzrlib.xml5.serializer_v5.write_inventory(Inventory(), f)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
327
1 by mbp at sourcefrog
import from baz patch-364
328
329
    def _check_format(self):
330
        """Check this branch format is supported.
331
1187 by Martin Pool
- improved check for branch version
332
        The format level is stored, as an integer, in
333
        self._branch_format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
334
335
        In the future, we might need different in-memory Branch
336
        classes to support downlevel branches.  But not yet.
163 by mbp at sourcefrog
merge win32 portability fixes
337
        """
1187 by Martin Pool
- improved check for branch version
338
        fmt = self.controlfile('branch-format', 'r').read()
339
        if fmt == BZR_BRANCH_FORMAT_5:
340
            self._branch_format = 5
341
        else:
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
342
            raise BzrError('sorry, branch format "%s" not supported; ' 
343
                           'use a different bzr version, '
344
                           'or run "bzr upgrade", '
345
                           'or remove the .bzr directory and "bzr init" again'
1191 by Martin Pool
- better message for bad branch version
346
                           % fmt.rstrip('\n\r'))
1 by mbp at sourcefrog
import from baz patch-364
347
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
348
    def get_root_id(self):
349
        """Return the id of this branches root"""
350
        inv = self.read_working_inventory()
351
        return inv.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
352
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
353
    def set_root_id(self, file_id):
354
        inv = self.read_working_inventory()
355
        orig_root_id = inv.root.file_id
356
        del inv._byid[inv.root.file_id]
357
        inv.root.file_id = file_id
358
        inv._byid[inv.root.file_id] = inv.root
359
        for fid in inv:
360
            entry = inv[fid]
361
            if entry.parent_id in (None, orig_root_id):
362
                entry.parent_id = inv.root.file_id
363
        self._write_inventory(inv)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
364
1 by mbp at sourcefrog
import from baz patch-364
365
    def read_working_inventory(self):
366
        """Read the working inventory."""
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
367
        self.lock_read()
368
        try:
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
369
            # ElementTree does its own conversion from UTF-8, so open in
370
            # binary.
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
371
            f = self.controlfile('inventory', 'rb')
1189 by Martin Pool
- BROKEN: partial support for commit into weave
372
            return bzrlib.xml5.serializer_v5.read_inventory(f)
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
373
        finally:
374
            self.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
375
            
1 by mbp at sourcefrog
import from baz patch-364
376
377
    def _write_inventory(self, inv):
378
        """Update the working inventory.
379
380
        That is to say, the inventory describing changes underway, that
381
        will be committed to the next revision.
382
        """
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
383
        from bzrlib.atomicfile import AtomicFile
384
        
770 by Martin Pool
- write new working inventory using AtomicFile
385
        self.lock_write()
386
        try:
387
            f = AtomicFile(self.controlfilename('inventory'), 'wb')
388
            try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
389
                bzrlib.xml5.serializer_v5.write_inventory(inv, f)
770 by Martin Pool
- write new working inventory using AtomicFile
390
                f.commit()
391
            finally:
392
                f.close()
393
        finally:
394
            self.unlock()
395
        
14 by mbp at sourcefrog
write inventory to temporary file and atomically replace
396
        mutter('wrote working inventory')
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
397
            
1 by mbp at sourcefrog
import from baz patch-364
398
399
    inventory = property(read_working_inventory, _write_inventory, None,
400
                         """Inventory for the working copy.""")
401
402
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
403
    def add(self, files, ids=None):
1 by mbp at sourcefrog
import from baz patch-364
404
        """Make files versioned.
405
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
406
        Note that the command line normally calls smart_add instead,
407
        which can automatically recurse.
247 by mbp at sourcefrog
doc
408
1 by mbp at sourcefrog
import from baz patch-364
409
        This puts the files in the Added state, so that they will be
410
        recorded by the next commit.
411
596 by Martin Pool
doc
412
        files
413
            List of paths to add, relative to the base of the tree.
414
415
        ids
416
            If set, use these instead of automatically generated ids.
417
            Must be the same length as the list of files, but may
418
            contain None for ids that are to be autogenerated.
419
254 by Martin Pool
- Doc cleanups from Magnus Therning
420
        TODO: Perhaps have an option to add the ids even if the files do
596 by Martin Pool
doc
421
              not (yet) exist.
1 by mbp at sourcefrog
import from baz patch-364
422
1129 by Martin Pool
- Branch.add shouldn't write to stdout either
423
        TODO: Perhaps yield the ids and paths as they're added.
1 by mbp at sourcefrog
import from baz patch-364
424
        """
425
        # TODO: Re-adding a file that is removed in the working copy
426
        # should probably put it back with the previous ID.
800 by Martin Pool
Merge John's import-speedup branch:
427
        if isinstance(files, basestring):
428
            assert(ids is None or isinstance(ids, basestring))
1 by mbp at sourcefrog
import from baz patch-364
429
            files = [files]
493 by Martin Pool
- Merge aaron's merge command
430
            if ids is not None:
431
                ids = [ids]
432
433
        if ids is None:
434
            ids = [None] * len(files)
435
        else:
436
            assert(len(ids) == len(files))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
437
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
438
        self.lock_write()
439
        try:
440
            inv = self.read_working_inventory()
441
            for f,file_id in zip(files, ids):
442
                if is_control_file(f):
443
                    raise BzrError("cannot add control file %s" % quotefn(f))
444
445
                fp = splitpath(f)
446
447
                if len(fp) == 0:
448
                    raise BzrError("cannot add top-level %r" % f)
449
450
                fullpath = os.path.normpath(self.abspath(f))
451
452
                try:
453
                    kind = file_kind(fullpath)
454
                except OSError:
455
                    # maybe something better?
456
                    raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
457
458
                if kind != 'file' and kind != 'directory':
459
                    raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
460
461
                if file_id is None:
462
                    file_id = gen_file_id(f)
463
                inv.add_path(f, kind=kind, file_id=file_id)
464
465
                mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
466
467
            self._write_inventory(inv)
468
        finally:
469
            self.unlock()
70 by mbp at sourcefrog
Prepare for smart recursive add.
470
            
1 by mbp at sourcefrog
import from baz patch-364
471
176 by mbp at sourcefrog
New cat command contributed by janmar.
472
    def print_file(self, file, revno):
473
        """Print `file` to stdout."""
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
474
        self.lock_read()
475
        try:
476
            tree = self.revision_tree(self.lookup_revision(revno))
477
            # use inventory as it was in that revision
478
            file_id = tree.inventory.path2id(file)
479
            if not file_id:
897 by Martin Pool
- merge john's revision-naming code
480
                raise BzrError("%r is not present in revision %s" % (file, revno))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
481
            tree.print_file(file_id)
482
        finally:
483
            self.unlock()
484
485
1 by mbp at sourcefrog
import from baz patch-364
486
    def remove(self, files, verbose=False):
487
        """Mark nominated files for removal from the inventory.
488
489
        This does not remove their text.  This does not run on 
490
254 by Martin Pool
- Doc cleanups from Magnus Therning
491
        TODO: Refuse to remove modified files unless --force is given?
1 by mbp at sourcefrog
import from baz patch-364
492
254 by Martin Pool
- Doc cleanups from Magnus Therning
493
        TODO: Do something useful with directories.
1 by mbp at sourcefrog
import from baz patch-364
494
254 by Martin Pool
- Doc cleanups from Magnus Therning
495
        TODO: Should this remove the text or not?  Tough call; not
1 by mbp at sourcefrog
import from baz patch-364
496
        removing may be useful and the user can just use use rm, and
497
        is the opposite of add.  Removing it is consistent with most
498
        other tools.  Maybe an option.
499
        """
500
        ## TODO: Normalize names
501
        ## TODO: Remove nested loops; better scalability
800 by Martin Pool
Merge John's import-speedup branch:
502
        if isinstance(files, basestring):
1 by mbp at sourcefrog
import from baz patch-364
503
            files = [files]
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
504
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
505
        self.lock_write()
506
507
        try:
508
            tree = self.working_tree()
509
            inv = tree.inventory
510
511
            # do this before any modifications
512
            for f in files:
513
                fid = inv.path2id(f)
514
                if not fid:
515
                    raise BzrError("cannot remove unversioned file %s" % quotefn(f))
516
                mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
517
                if verbose:
518
                    # having remove it, it must be either ignored or unknown
519
                    if tree.is_ignored(f):
520
                        new_status = 'I'
521
                    else:
522
                        new_status = '?'
523
                    show_status(new_status, inv[fid].kind, quotefn(f))
524
                del inv[fid]
525
526
            self._write_inventory(inv)
527
        finally:
528
            self.unlock()
529
530
612 by Martin Pool
doc
531
    # FIXME: this doesn't need to be a branch method
493 by Martin Pool
- Merge aaron's merge command
532
    def set_inventory(self, new_inventory_list):
800 by Martin Pool
Merge John's import-speedup branch:
533
        from bzrlib.inventory import Inventory, InventoryEntry
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
534
        inv = Inventory(self.get_root_id())
493 by Martin Pool
- Merge aaron's merge command
535
        for path, file_id, parent, kind in new_inventory_list:
536
            name = os.path.basename(path)
537
            if name == "":
538
                continue
539
            inv.add(InventoryEntry(file_id, name, kind, parent))
540
        self._write_inventory(inv)
541
1 by mbp at sourcefrog
import from baz patch-364
542
543
    def unknowns(self):
544
        """Return all unknown files.
545
546
        These are files in the working directory that are not versioned or
547
        control files or ignored.
548
        
549
        >>> b = ScratchBranch(files=['foo', 'foo~'])
550
        >>> list(b.unknowns())
551
        ['foo']
552
        >>> b.add('foo')
553
        >>> list(b.unknowns())
554
        []
555
        >>> b.remove('foo')
556
        >>> list(b.unknowns())
557
        ['foo']
558
        """
559
        return self.working_tree().unknowns()
560
561
905 by Martin Pool
- merge aaron's append_multiple.patch
562
    def append_revision(self, *revision_ids):
769 by Martin Pool
- append to branch revision history using AtomicFile
563
        from bzrlib.atomicfile import AtomicFile
564
905 by Martin Pool
- merge aaron's append_multiple.patch
565
        for revision_id in revision_ids:
566
            mutter("add {%s} to revision-history" % revision_id)
567
568
        rev_history = self.revision_history()
569
        rev_history.extend(revision_ids)
769 by Martin Pool
- append to branch revision history using AtomicFile
570
571
        f = AtomicFile(self.controlfilename('revision-history'))
572
        try:
573
            for rev_id in rev_history:
574
                print >>f, rev_id
575
            f.commit()
576
        finally:
577
            f.close()
233 by mbp at sourcefrog
- more output from test.sh
578
579
1182 by Martin Pool
- more disentangling of xml storage format from objects
580
    def get_revision_xml_file(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
581
        """Return XML file object for revision object."""
582
        if not revision_id or not isinstance(revision_id, basestring):
583
            raise InvalidRevisionId(revision_id)
584
585
        self.lock_read()
586
        try:
587
            try:
588
                return self.revision_store[revision_id]
589
            except IndexError:
590
                raise bzrlib.errors.NoSuchRevision(self, revision_id)
591
        finally:
592
            self.unlock()
593
594
1182 by Martin Pool
- more disentangling of xml storage format from objects
595
    #deprecated
596
    get_revision_xml = get_revision_xml_file
597
598
1 by mbp at sourcefrog
import from baz patch-364
599
    def get_revision(self, revision_id):
600
        """Return the Revision object for a named revision"""
1182 by Martin Pool
- more disentangling of xml storage format from objects
601
        xml_file = self.get_revision_xml_file(revision_id)
1027 by Martin Pool
- better error message when failing to get revision from store
602
603
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
604
            r = bzrlib.xml5.serializer_v5.read_revision(xml_file)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
605
        except SyntaxError, e:
606
            raise bzrlib.errors.BzrError('failed to unpack revision_xml',
607
                                         [revision_id,
608
                                          str(e)])
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
609
            
1 by mbp at sourcefrog
import from baz patch-364
610
        assert r.revision_id == revision_id
611
        return r
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
612
613
614
    def get_revision_delta(self, revno):
615
        """Return the delta for one revision.
616
617
        The delta is relative to its mainline predecessor, or the
618
        empty tree for revision 1.
619
        """
620
        assert isinstance(revno, int)
621
        rh = self.revision_history()
622
        if not (1 <= revno <= len(rh)):
623
            raise InvalidRevisionNumber(revno)
624
625
        # revno is 1-based; list is 0-based
626
627
        new_tree = self.revision_tree(rh[revno-1])
628
        if revno == 1:
629
            old_tree = EmptyTree()
630
        else:
631
            old_tree = self.revision_tree(rh[revno-2])
632
633
        return compare_trees(old_tree, new_tree)
634
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
635
        
1 by mbp at sourcefrog
import from baz patch-364
636
672 by Martin Pool
- revision records include the hash of their inventory and
637
    def get_revision_sha1(self, revision_id):
638
        """Hash the stored value of a revision, and return it."""
639
        # In the future, revision entries will be signed. At that
640
        # point, it is probably best *not* to include the signature
641
        # in the revision hash. Because that lets you re-sign
642
        # the revision, (add signatures/remove signatures) and still
643
        # have all hash pointers stay consistent.
644
        # But for now, just hash the contents.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
645
        return bzrlib.osutils.sha_file(self.get_revision_xml(revision_id))
672 by Martin Pool
- revision records include the hash of their inventory and
646
1 by mbp at sourcefrog
import from baz patch-364
647
1192 by Martin Pool
- clean up code for retrieving stored inventories
648
    def get_inventory(self, revision_id):
1 by mbp at sourcefrog
import from baz patch-364
649
        """Get Inventory object by hash.
650
254 by Martin Pool
- Doc cleanups from Magnus Therning
651
        TODO: Perhaps for this and similar methods, take a revision
1 by mbp at sourcefrog
import from baz patch-364
652
               parameter which can be either an integer revno or a
653
               string hash."""
1192 by Martin Pool
- clean up code for retrieving stored inventories
654
        f = self.get_inventory_xml_file(revision_id)
1189 by Martin Pool
- BROKEN: partial support for commit into weave
655
        return bzrlib.xml5.serializer_v5.read_inventory(f)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
656
657
1192 by Martin Pool
- clean up code for retrieving stored inventories
658
    def get_inventory_xml(self, revision_id):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
659
        """Get inventory XML as a file object."""
1192 by Martin Pool
- clean up code for retrieving stored inventories
660
        try:
661
            assert isinstance(revision_id, basestring), type(revision_id)
662
            return self.inventory_store[revision_id]
663
        except IndexError:
664
            raise bzrlib.errors.HistoryMissing(self, 'inventory', revision_id)
1180 by Martin Pool
- start splitting code for xml (de)serialization away from objects
665
666
    get_inventory_xml_file = get_inventory_xml
802 by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions
667
            
1 by mbp at sourcefrog
import from baz patch-364
668
1192 by Martin Pool
- clean up code for retrieving stored inventories
669
    def get_inventory_sha1(self, revision_id):
672 by Martin Pool
- revision records include the hash of their inventory and
670
        """Return the sha1 hash of the inventory entry
671
        """
1192 by Martin Pool
- clean up code for retrieving stored inventories
672
        return sha_file(self.get_inventory_xml_file(revision_id))
672 by Martin Pool
- revision records include the hash of their inventory and
673
1 by mbp at sourcefrog
import from baz patch-364
674
675
    def get_revision_inventory(self, revision_id):
676
        """Return inventory of a past revision."""
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
677
        # bzr 0.0.6 imposes the constraint that the inventory_id
678
        # must be the same as its revision, so this is trivial.
1 by mbp at sourcefrog
import from baz patch-364
679
        if revision_id == None:
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
680
            return Inventory(self.get_root_id())
1 by mbp at sourcefrog
import from baz patch-364
681
        else:
820 by Martin Pool
- faster Branch.get_revision_inventory now we know the ids are the same
682
            return self.get_inventory(revision_id)
1 by mbp at sourcefrog
import from baz patch-364
683
684
685
    def revision_history(self):
686
        """Return sequence of revision hashes on to this branch.
687
688
        >>> ScratchBranch().revision_history()
689
        []
690
        """
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
691
        self.lock_read()
692
        try:
693
            return [l.rstrip('\r\n') for l in
694
                    self.controlfile('revision-history', 'r').readlines()]
695
        finally:
696
            self.unlock()
1 by mbp at sourcefrog
import from baz patch-364
697
698
622 by Martin Pool
Updated merge patch from Aaron
699
    def common_ancestor(self, other, self_revno=None, other_revno=None):
700
        """
701
        >>> import commit
702
        >>> sb = ScratchBranch(files=['foo', 'foo~'])
703
        >>> sb.common_ancestor(sb) == (None, None)
704
        True
705
        >>> commit.commit(sb, "Committing first revision", verbose=False)
706
        >>> sb.common_ancestor(sb)[0]
707
        1
708
        >>> clone = sb.clone()
709
        >>> commit.commit(sb, "Committing second revision", verbose=False)
710
        >>> sb.common_ancestor(sb)[0]
711
        2
712
        >>> sb.common_ancestor(clone)[0]
713
        1
714
        >>> commit.commit(clone, "Committing divergent second revision", 
715
        ...               verbose=False)
716
        >>> sb.common_ancestor(clone)[0]
717
        1
718
        >>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
719
        True
720
        >>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
721
        True
722
        >>> clone2 = sb.clone()
723
        >>> sb.common_ancestor(clone2)[0]
724
        2
725
        >>> sb.common_ancestor(clone2, self_revno=1)[0]
726
        1
727
        >>> sb.common_ancestor(clone2, other_revno=1)[0]
728
        1
729
        """
730
        my_history = self.revision_history()
731
        other_history = other.revision_history()
732
        if self_revno is None:
733
            self_revno = len(my_history)
734
        if other_revno is None:
735
            other_revno = len(other_history)
736
        indices = range(min((self_revno, other_revno)))
737
        indices.reverse()
738
        for r in indices:
739
            if my_history[r] == other_history[r]:
740
                return r+1, my_history[r]
741
        return None, None
742
385 by Martin Pool
- New Branch.enum_history method
743
1 by mbp at sourcefrog
import from baz patch-364
744
    def revno(self):
745
        """Return current revision number for this branch.
746
747
        That is equivalent to the number of revisions committed to
748
        this branch.
749
        """
750
        return len(self.revision_history())
751
752
753
    def last_patch(self):
754
        """Return last patch hash, or None if no history.
755
        """
756
        ph = self.revision_history()
757
        if ph:
758
            return ph[-1]
184 by mbp at sourcefrog
pychecker fixups
759
        else:
760
            return None
485 by Martin Pool
- move commit code into its own module
761
762
974.1.27 by aaron.bentley at utoronto
Initial greedy fetch work
763
    def missing_revisions(self, other, stop_revision=None, diverged_ok=False):
628 by Martin Pool
- merge aaron's updated merge/pull code
764
        """
765
        If self and other have not diverged, return a list of the revisions
766
        present in other, but missing from self.
767
768
        >>> from bzrlib.commit import commit
769
        >>> bzrlib.trace.silent = True
770
        >>> br1 = ScratchBranch()
771
        >>> br2 = ScratchBranch()
772
        >>> br1.missing_revisions(br2)
773
        []
774
        >>> commit(br2, "lala!", rev_id="REVISION-ID-1")
775
        >>> br1.missing_revisions(br2)
776
        [u'REVISION-ID-1']
777
        >>> br2.missing_revisions(br1)
778
        []
779
        >>> commit(br1, "lala!", rev_id="REVISION-ID-1")
780
        >>> br1.missing_revisions(br2)
781
        []
782
        >>> commit(br2, "lala!", rev_id="REVISION-ID-2A")
783
        >>> br1.missing_revisions(br2)
784
        [u'REVISION-ID-2A']
785
        >>> commit(br1, "lala!", rev_id="REVISION-ID-2B")
786
        >>> br1.missing_revisions(br2)
787
        Traceback (most recent call last):
788
        DivergedBranches: These branches have diverged.
789
        """
790
        self_history = self.revision_history()
791
        self_len = len(self_history)
792
        other_history = other.revision_history()
793
        other_len = len(other_history)
794
        common_index = min(self_len, other_len) -1
795
        if common_index >= 0 and \
796
            self_history[common_index] != other_history[common_index]:
797
            raise DivergedBranches(self, other)
685 by Martin Pool
- add -r option to the branch command
798
799
        if stop_revision is None:
800
            stop_revision = other_len
801
        elif stop_revision > other_len:
1103 by Martin Pool
- some pychecker cleanups
802
            raise bzrlib.errors.NoSuchRevision(self, stop_revision)
685 by Martin Pool
- add -r option to the branch command
803
        
804
        return other_history[self_len:stop_revision]
805
806
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
807
    def update_revisions(self, other, stop_revision=None):
663 by Martin Pool
doc
808
        """Pull in all new revisions from other branch.
628 by Martin Pool
- merge aaron's updated merge/pull code
809
        """
974.1.33 by aaron.bentley at utoronto
Added greedy_fetch to update_revisions
810
        from bzrlib.fetch import greedy_fetch
1110 by Martin Pool
- merge aaron's merge improvements:
811
812
        pb = bzrlib.ui.ui_factory.progress_bar()
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
813
        pb.update('comparing histories')
1110 by Martin Pool
- merge aaron's merge improvements:
814
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
815
        revision_ids = self.missing_revisions(other, stop_revision)
1110 by Martin Pool
- merge aaron's merge improvements:
816
974.1.33 by aaron.bentley at utoronto
Added greedy_fetch to update_revisions
817
        if len(revision_ids) > 0:
818
            count = greedy_fetch(self, other, revision_ids[-1], pb)[0]
819
        else:
820
            count = 0
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
821
        self.append_revision(*revision_ids)
1110 by Martin Pool
- merge aaron's merge improvements:
822
        ## note("Added %d revisions." % count)
1116 by Martin Pool
- fix a few errors in new merge code
823
        pb.clear()
1104 by Martin Pool
- Add a simple UIFactory
824
1110 by Martin Pool
- merge aaron's merge improvements:
825
    def install_revisions(self, other, revision_ids, pb):
790 by Martin Pool
Merge from aaron:
826
        if hasattr(other.revision_store, "prefetch"):
827
            other.revision_store.prefetch(revision_ids)
828
        if hasattr(other.inventory_store, "prefetch"):
829
            inventory_ids = [other.get_revision(r).inventory_id
830
                             for r in revision_ids]
831
            other.inventory_store.prefetch(inventory_ids)
1110 by Martin Pool
- merge aaron's merge improvements:
832
833
        if pb is None:
834
            pb = bzrlib.ui.ui_factory.progress_bar()
790 by Martin Pool
Merge from aaron:
835
                
670 by Martin Pool
- Show progress while branching
836
        revisions = []
800 by Martin Pool
Merge John's import-speedup branch:
837
        needed_texts = set()
670 by Martin Pool
- Show progress while branching
838
        i = 0
1110 by Martin Pool
- merge aaron's merge improvements:
839
974.1.30 by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions
840
        failures = set()
841
        for i, rev_id in enumerate(revision_ids):
842
            pb.update('fetching revision', i+1, len(revision_ids))
843
            try:
844
                rev = other.get_revision(rev_id)
845
            except bzrlib.errors.NoSuchRevision:
846
                failures.add(rev_id)
847
                continue
1110 by Martin Pool
- merge aaron's merge improvements:
848
670 by Martin Pool
- Show progress while branching
849
            revisions.append(rev)
628 by Martin Pool
- merge aaron's updated merge/pull code
850
            inv = other.get_inventory(str(rev.inventory_id))
851
            for key, entry in inv.iter_entries():
852
                if entry.text_id is None:
853
                    continue
854
                if entry.text_id not in self.text_store:
855
                    needed_texts.add(entry.text_id)
670 by Martin Pool
- Show progress while branching
856
1092.1.35 by Robert Collins
merge from mpool up to rev 1110
857
        pb.clear()
670 by Martin Pool
- Show progress while branching
858
                    
974.1.30 by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions
859
        count, cp_fail = self.text_store.copy_multi(other.text_store, 
860
                                                    needed_texts)
1116 by Martin Pool
- fix a few errors in new merge code
861
        #print "Added %d texts." % count 
628 by Martin Pool
- merge aaron's updated merge/pull code
862
        inventory_ids = [ f.inventory_id for f in revisions ]
974.1.30 by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions
863
        count, cp_fail = self.inventory_store.copy_multi(other.inventory_store, 
864
                                                         inventory_ids)
1116 by Martin Pool
- fix a few errors in new merge code
865
        #print "Added %d inventories." % count 
628 by Martin Pool
- merge aaron's updated merge/pull code
866
        revision_ids = [ f.revision_id for f in revisions]
1110 by Martin Pool
- merge aaron's merge improvements:
867
974.1.30 by aaron.bentley at utoronto
Changed copy_multi to permit failure and return a tuple, tested missing required revisions
868
        count, cp_fail = self.revision_store.copy_multi(other.revision_store, 
869
                                                          revision_ids,
870
                                                          permit_failure=True)
871
        assert len(cp_fail) == 0 
872
        return count, failures
974.1.28 by aaron.bentley at utoronto
factored install_revisions out of update_revisions, updated test cases for greedy_fetch
873
       
1110 by Martin Pool
- merge aaron's merge improvements:
874
485 by Martin Pool
- move commit code into its own module
875
    def commit(self, *args, **kw):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
876
        from bzrlib.commit import Commit
877
        Commit().commit(self, *args, **kw)
184 by mbp at sourcefrog
pychecker fixups
878
        
1 by mbp at sourcefrog
import from baz patch-364
879
897 by Martin Pool
- merge john's revision-naming code
880
    def lookup_revision(self, revision):
881
        """Return the revision identifier for a given revision information."""
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
882
        revno, info = self._get_revision_info(revision)
897 by Martin Pool
- merge john's revision-naming code
883
        return info
884
1105 by Martin Pool
- expose 'find-merge-base' as a new expert command,
885
886
    def revision_id_to_revno(self, revision_id):
887
        """Given a revision id, return its revno"""
888
        history = self.revision_history()
889
        try:
890
            return history.index(revision_id) + 1
891
        except ValueError:
892
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
893
894
897 by Martin Pool
- merge john's revision-naming code
895
    def get_revision_info(self, revision):
896
        """Return (revno, revision id) for revision identifier.
897
898
        revision can be an integer, in which case it is assumed to be revno (though
899
            this will translate negative values into positive ones)
900
        revision can also be a string, in which case it is parsed for something like
901
            'date:' or 'revid:' etc.
902
        """
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
903
        revno, rev_id = self._get_revision_info(revision)
904
        if revno is None:
905
            raise bzrlib.errors.NoSuchRevision(self, revision)
906
        return revno, rev_id
907
908
    def get_rev_id(self, revno, history=None):
909
        """Find the revision id of the specified revno."""
910
        if revno == 0:
911
            return None
912
        if history is None:
913
            history = self.revision_history()
914
        elif revno <= 0 or revno > len(history):
915
            raise bzrlib.errors.NoSuchRevision(self, revno)
916
        return history[revno - 1]
917
918
    def _get_revision_info(self, revision):
919
        """Return (revno, revision id) for revision specifier.
920
921
        revision can be an integer, in which case it is assumed to be revno
922
        (though this will translate negative values into positive ones)
923
        revision can also be a string, in which case it is parsed for something
924
        like 'date:' or 'revid:' etc.
925
926
        A revid is always returned.  If it is None, the specifier referred to
927
        the null revision.  If the revid does not occur in the revision
928
        history, revno will be None.
929
        """
930
        
897 by Martin Pool
- merge john's revision-naming code
931
        if revision is None:
932
            return 0, None
933
        revno = None
934
        try:# Convert to int if possible
935
            revision = int(revision)
936
        except ValueError:
937
            pass
938
        revs = self.revision_history()
939
        if isinstance(revision, int):
940
            if revision < 0:
941
                revno = len(revs) + revision + 1
942
            else:
943
                revno = revision
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
944
            rev_id = self.get_rev_id(revno, revs)
897 by Martin Pool
- merge john's revision-naming code
945
        elif isinstance(revision, basestring):
946
            for prefix, func in Branch.REVISION_NAMESPACES.iteritems():
947
                if revision.startswith(prefix):
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
948
                    result = func(self, revs, revision)
949
                    if len(result) > 1:
950
                        revno, rev_id = result
951
                    else:
952
                        revno = result[0]
953
                        rev_id = self.get_rev_id(revno, revs)
897 by Martin Pool
- merge john's revision-naming code
954
                    break
955
            else:
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
956
                raise BzrError('No namespace registered for string: %r' %
957
                               revision)
958
        else:
959
            raise TypeError('Unhandled revision type %s' % revision)
897 by Martin Pool
- merge john's revision-naming code
960
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
961
        if revno is None:
962
            if rev_id is None:
963
                raise bzrlib.errors.NoSuchRevision(self, revision)
964
        return revno, rev_id
897 by Martin Pool
- merge john's revision-naming code
965
966
    def _namespace_revno(self, revs, revision):
967
        """Lookup a revision by revision number"""
968
        assert revision.startswith('revno:')
969
        try:
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
970
            return (int(revision[6:]),)
897 by Martin Pool
- merge john's revision-naming code
971
        except ValueError:
972
            return None
973
    REVISION_NAMESPACES['revno:'] = _namespace_revno
974
975
    def _namespace_revid(self, revs, revision):
976
        assert revision.startswith('revid:')
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
977
        rev_id = revision[len('revid:'):]
897 by Martin Pool
- merge john's revision-naming code
978
        try:
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
979
            return revs.index(rev_id) + 1, rev_id
897 by Martin Pool
- merge john's revision-naming code
980
        except ValueError:
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
981
            return None, rev_id
897 by Martin Pool
- merge john's revision-naming code
982
    REVISION_NAMESPACES['revid:'] = _namespace_revid
983
984
    def _namespace_last(self, revs, revision):
985
        assert revision.startswith('last:')
986
        try:
987
            offset = int(revision[5:])
988
        except ValueError:
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
989
            return (None,)
897 by Martin Pool
- merge john's revision-naming code
990
        else:
991
            if offset <= 0:
992
                raise BzrError('You must supply a positive value for --revision last:XXX')
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
993
            return (len(revs) - offset + 1,)
897 by Martin Pool
- merge john's revision-naming code
994
    REVISION_NAMESPACES['last:'] = _namespace_last
995
996
    def _namespace_tag(self, revs, revision):
997
        assert revision.startswith('tag:')
998
        raise BzrError('tag: namespace registered, but not implemented.')
999
    REVISION_NAMESPACES['tag:'] = _namespace_tag
1000
1001
    def _namespace_date(self, revs, revision):
1002
        assert revision.startswith('date:')
1003
        import datetime
1004
        # Spec for date revisions:
1005
        #   date:value
1006
        #   value can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.
1007
        #   it can also start with a '+/-/='. '+' says match the first
1008
        #   entry after the given date. '-' is match the first entry before the date
1009
        #   '=' is match the first entry after, but still on the given date.
1010
        #
1011
        #   +2005-05-12 says find the first matching entry after May 12th, 2005 at 0:00
1012
        #   -2005-05-12 says find the first matching entry before May 12th, 2005 at 0:00
1013
        #   =2005-05-12 says find the first match after May 12th, 2005 at 0:00 but before
1014
        #       May 13th, 2005 at 0:00
1015
        #
1016
        #   So the proper way of saying 'give me all entries for today' is:
1017
        #       -r {date:+today}:{date:-tomorrow}
1018
        #   The default is '=' when not supplied
1019
        val = revision[5:]
1020
        match_style = '='
1021
        if val[:1] in ('+', '-', '='):
1022
            match_style = val[:1]
1023
            val = val[1:]
1024
1025
        today = datetime.datetime.today().replace(hour=0,minute=0,second=0,microsecond=0)
1026
        if val.lower() == 'yesterday':
1027
            dt = today - datetime.timedelta(days=1)
1028
        elif val.lower() == 'today':
1029
            dt = today
1030
        elif val.lower() == 'tomorrow':
1031
            dt = today + datetime.timedelta(days=1)
1032
        else:
901 by Martin Pool
- fix missing import
1033
            import re
897 by Martin Pool
- merge john's revision-naming code
1034
            # This should be done outside the function to avoid recompiling it.
1035
            _date_re = re.compile(
1036
                    r'(?P<date>(?P<year>\d\d\d\d)-(?P<month>\d\d)-(?P<day>\d\d))?'
1037
                    r'(,|T)?\s*'
1038
                    r'(?P<time>(?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d))?)?'
1039
                )
1040
            m = _date_re.match(val)
1041
            if not m or (not m.group('date') and not m.group('time')):
1042
                raise BzrError('Invalid revision date %r' % revision)
1043
1044
            if m.group('date'):
1045
                year, month, day = int(m.group('year')), int(m.group('month')), int(m.group('day'))
1046
            else:
1047
                year, month, day = today.year, today.month, today.day
1048
            if m.group('time'):
1049
                hour = int(m.group('hour'))
1050
                minute = int(m.group('minute'))
1051
                if m.group('second'):
1052
                    second = int(m.group('second'))
1053
                else:
1054
                    second = 0
1055
            else:
1056
                hour, minute, second = 0,0,0
1057
1058
            dt = datetime.datetime(year=year, month=month, day=day,
1059
                    hour=hour, minute=minute, second=second)
1060
        first = dt
1061
        last = None
1062
        reversed = False
1063
        if match_style == '-':
1064
            reversed = True
1065
        elif match_style == '=':
1066
            last = dt + datetime.timedelta(days=1)
1067
1068
        if reversed:
1069
            for i in range(len(revs)-1, -1, -1):
1070
                r = self.get_revision(revs[i])
1071
                # TODO: Handle timezone.
1072
                dt = datetime.datetime.fromtimestamp(r.timestamp)
1073
                if first >= dt and (last is None or dt >= last):
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
1074
                    return (i+1,)
897 by Martin Pool
- merge john's revision-naming code
1075
        else:
1076
            for i in range(len(revs)):
1077
                r = self.get_revision(revs[i])
1078
                # TODO: Handle timezone.
1079
                dt = datetime.datetime.fromtimestamp(r.timestamp)
1080
                if first <= dt and (last is None or dt <= last):
974.2.7 by aaron.bentley at utoronto
Merged from bzr.24
1081
                    return (i+1,)
897 by Martin Pool
- merge john's revision-naming code
1082
    REVISION_NAMESPACES['date:'] = _namespace_date
1 by mbp at sourcefrog
import from baz patch-364
1083
1084
    def revision_tree(self, revision_id):
1085
        """Return Tree for a revision on this branch.
1086
1087
        `revision_id` may be None for the null revision, in which case
1088
        an `EmptyTree` is returned."""
529 by Martin Pool
todo
1089
        # TODO: refactor this to use an existing revision object
1090
        # so we don't need to read it in twice.
1 by mbp at sourcefrog
import from baz patch-364
1091
        if revision_id == None:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
1092
            return EmptyTree()
1 by mbp at sourcefrog
import from baz patch-364
1093
        else:
1094
            inv = self.get_revision_inventory(revision_id)
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
1095
            return RevisionTree(self.weave_store, inv, revision_id)
1 by mbp at sourcefrog
import from baz patch-364
1096
1097
1098
    def working_tree(self):
1099
        """Return a `Tree` for the working copy."""
453 by Martin Pool
- Split WorkingTree into its own file
1100
        from workingtree import WorkingTree
1 by mbp at sourcefrog
import from baz patch-364
1101
        return WorkingTree(self.base, self.read_working_inventory())
1102
1103
1104
    def basis_tree(self):
1105
        """Return `Tree` object for last revision.
1106
1107
        If there are no revisions yet, return an `EmptyTree`.
1108
        """
1196 by Martin Pool
- [WIP] retrieve historical texts from weaves
1109
        return self.revision_tree(self.last_patch())
1 by mbp at sourcefrog
import from baz patch-364
1110
1111
168 by mbp at sourcefrog
new "rename" command
1112
    def rename_one(self, from_rel, to_rel):
309 by Martin Pool
doc
1113
        """Rename one file.
1114
1115
        This can change the directory or the filename or both.
353 by Martin Pool
- Per-branch locks in read and write modes.
1116
        """
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1117
        self.lock_write()
171 by mbp at sourcefrog
better error message when working file rename fails
1118
        try:
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1119
            tree = self.working_tree()
1120
            inv = tree.inventory
1121
            if not tree.has_filename(from_rel):
1122
                raise BzrError("can't rename: old working file %r does not exist" % from_rel)
1123
            if tree.has_filename(to_rel):
1124
                raise BzrError("can't rename: new working file %r already exists" % to_rel)
1125
1126
            file_id = inv.path2id(from_rel)
1127
            if file_id == None:
1128
                raise BzrError("can't rename: old name %r is not versioned" % from_rel)
1129
1130
            if inv.path2id(to_rel):
1131
                raise BzrError("can't rename: new name %r is already versioned" % to_rel)
1132
1133
            to_dir, to_tail = os.path.split(to_rel)
1134
            to_dir_id = inv.path2id(to_dir)
1135
            if to_dir_id == None and to_dir != '':
1136
                raise BzrError("can't determine destination directory id for %r" % to_dir)
1137
1138
            mutter("rename_one:")
1139
            mutter("  file_id    {%s}" % file_id)
1140
            mutter("  from_rel   %r" % from_rel)
1141
            mutter("  to_rel     %r" % to_rel)
1142
            mutter("  to_dir     %r" % to_dir)
1143
            mutter("  to_dir_id  {%s}" % to_dir_id)
1144
1145
            inv.rename(file_id, to_dir_id, to_tail)
1146
1147
            from_abs = self.abspath(from_rel)
1148
            to_abs = self.abspath(to_rel)
1149
            try:
1150
                os.rename(from_abs, to_abs)
1151
            except OSError, e:
1152
                raise BzrError("failed to rename %r to %r: %s"
1153
                        % (from_abs, to_abs, e[1]),
1154
                        ["rename rolled back"])
1155
1156
            self._write_inventory(inv)
1157
        finally:
1158
            self.unlock()
1159
1160
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
1161
    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
1162
        """Rename files.
1163
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
1164
        to_name must exist as a versioned directory.
1165
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
1166
        If to_name exists and is a directory, the files are moved into
1167
        it, keeping their old names.  If it is a directory, 
1168
1169
        Note that to_name is only the last component of the new name;
1170
        this doesn't change the directory.
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1171
1172
        This returns a list of (from_path, to_path) pairs for each
1173
        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
1174
        """
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1175
        result = []
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1176
        self.lock_write()
1177
        try:
1178
            ## TODO: Option to move IDs only
1179
            assert not isinstance(from_paths, basestring)
1180
            tree = self.working_tree()
1181
            inv = tree.inventory
1182
            to_abs = self.abspath(to_name)
1183
            if not isdir(to_abs):
1184
                raise BzrError("destination %r is not a directory" % to_abs)
1185
            if not tree.has_filename(to_name):
1186
                raise BzrError("destination %r not in working directory" % to_abs)
1187
            to_dir_id = inv.path2id(to_name)
1188
            if to_dir_id == None and to_name != '':
1189
                raise BzrError("destination %r is not a versioned directory" % to_name)
1190
            to_dir_ie = inv[to_dir_id]
1191
            if to_dir_ie.kind not in ('directory', 'root_directory'):
1192
                raise BzrError("destination %r is not a directory" % to_abs)
1193
1194
            to_idpath = inv.get_idpath(to_dir_id)
1195
1196
            for f in from_paths:
1197
                if not tree.has_filename(f):
1198
                    raise BzrError("%r does not exist in working tree" % f)
1199
                f_id = inv.path2id(f)
1200
                if f_id == None:
1201
                    raise BzrError("%r is not versioned" % f)
1202
                name_tail = splitpath(f)[-1]
1203
                dest_path = appendpath(to_name, name_tail)
1204
                if tree.has_filename(dest_path):
1205
                    raise BzrError("destination %r already exists" % dest_path)
1206
                if f_id in to_idpath:
1207
                    raise BzrError("can't move %r to a subdirectory of itself" % f)
1208
1209
            # OK, so there's a race here, it's possible that someone will
1210
            # create a file in this interval and then the rename might be
1211
            # left half-done.  But we should have caught most problems.
1212
1213
            for f in from_paths:
1214
                name_tail = splitpath(f)[-1]
1215
                dest_path = appendpath(to_name, name_tail)
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1216
                result.append((f, dest_path))
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
1217
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
1218
                try:
1219
                    os.rename(self.abspath(f), self.abspath(dest_path))
1220
                except OSError, e:
1221
                    raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
1222
                            ["rename rolled back"])
1223
1224
            self._write_inventory(inv)
1225
        finally:
1226
            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
1227
1131 by Martin Pool
- remove more extraneous print statements from Branch.move
1228
        return result
1229
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
1230
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1231
    def revert(self, filenames, old_tree=None, backups=True):
778 by Martin Pool
- simple revert of text files
1232
        """Restore selected files to the versions from a previous tree.
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1233
1234
        backups
1235
            If true (default) backups are made of files before
1236
            they're renamed.
778 by Martin Pool
- simple revert of text files
1237
        """
1238
        from bzrlib.errors import NotVersionedError, BzrError
1239
        from bzrlib.atomicfile import AtomicFile
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1240
        from bzrlib.osutils import backup_file
778 by Martin Pool
- simple revert of text files
1241
        
1242
        inv = self.read_working_inventory()
1243
        if old_tree is None:
1244
            old_tree = self.basis_tree()
1245
        old_inv = old_tree.inventory
1246
1247
        nids = []
1248
        for fn in filenames:
1249
            file_id = inv.path2id(fn)
1250
            if not file_id:
1251
                raise NotVersionedError("not a versioned file", fn)
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1252
            if not old_inv.has_id(file_id):
1253
                raise BzrError("file not present in old tree", fn, file_id)
778 by Martin Pool
- simple revert of text files
1254
            nids.append((fn, file_id))
1255
            
1256
        # TODO: Rename back if it was previously at a different location
1257
1258
        # TODO: If given a directory, restore the entire contents from
1259
        # the previous version.
1260
1261
        # TODO: Make a backup to a temporary file.
1262
1263
        # TODO: If the file previously didn't exist, delete it?
1264
        for fn, file_id in nids:
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
1265
            backup_file(fn)
1266
            
778 by Martin Pool
- simple revert of text files
1267
            f = AtomicFile(fn, 'wb')
1268
            try:
1269
                f.write(old_tree.get_file(file_id).read())
1270
                f.commit()
1271
            finally:
1272
                f.close()
1273
1274
815 by Martin Pool
- track pending-merges
1275
    def pending_merges(self):
1276
        """Return a list of pending merges.
1277
1278
        These are revisions that have been merged into the working
1279
        directory but not yet committed.
1280
        """
1281
        cfn = self.controlfilename('pending-merges')
1282
        if not os.path.exists(cfn):
1283
            return []
1284
        p = []
1285
        for l in self.controlfile('pending-merges', 'r').readlines():
1286
            p.append(l.rstrip('\n'))
1287
        return p
1288
1289
1290
    def add_pending_merge(self, revision_id):
1291
        from bzrlib.revision import validate_revision_id
1292
1293
        validate_revision_id(revision_id)
1294
1295
        p = self.pending_merges()
1296
        if revision_id in p:
1297
            return
1298
        p.append(revision_id)
1299
        self.set_pending_merges(p)
1300
1301
1302
    def set_pending_merges(self, rev_list):
1303
        from bzrlib.atomicfile import AtomicFile
1304
        self.lock_write()
1305
        try:
1306
            f = AtomicFile(self.controlfilename('pending-merges'))
1307
            try:
1308
                for l in rev_list:
1309
                    print >>f, l
1310
                f.commit()
1311
            finally:
1312
                f.close()
1313
        finally:
1314
            self.unlock()
1315
1316
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1317
    def get_parent(self):
1318
        """Return the parent location of the branch.
1319
1320
        This is the default location for push/pull/missing.  The usual
1321
        pattern is that the user can override it by specifying a
1322
        location.
1323
        """
1324
        import errno
1325
        _locs = ['parent', 'pull', 'x-pull']
1326
        for l in _locs:
1327
            try:
1328
                return self.controlfile(l, 'r').read().strip('\n')
1329
            except IOError, e:
1330
                if e.errno != errno.ENOENT:
1331
                    raise
1332
        return None
1333
1150 by Martin Pool
- add new Branch.set_parent and tests
1334
1335
    def set_parent(self, url):
1336
        # TODO: Maybe delete old location files?
1337
        from bzrlib.atomicfile import AtomicFile
1338
        self.lock_write()
1339
        try:
1340
            f = AtomicFile(self.controlfilename('parent'))
1341
            try:
1342
                f.write(url + '\n')
1343
                f.commit()
1344
            finally:
1345
                f.close()
1346
        finally:
1347
            self.unlock()
1348
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
1349
    def check_revno(self, revno):
1350
        """\
1351
        Check whether a revno corresponds to any revision.
1352
        Zero (the NULL revision) is considered valid.
1353
        """
1354
        if revno != 0:
1355
            self.check_real_revno(revno)
1356
            
1357
    def check_real_revno(self, revno):
1358
        """\
1359
        Check whether a revno corresponds to a real revision.
1360
        Zero (the NULL revision) is considered invalid
1361
        """
1362
        if revno < 1 or revno > self.revno():
1363
            raise InvalidRevisionNumber(revno)
1364
        
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1365
        
1366
1 by mbp at sourcefrog
import from baz patch-364
1367
1368
class ScratchBranch(Branch):
1369
    """Special test class: a branch that cleans up after itself.
1370
1371
    >>> b = ScratchBranch()
1372
    >>> isdir(b.base)
1373
    True
1374
    >>> bd = b.base
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1375
    >>> b.destroy()
1 by mbp at sourcefrog
import from baz patch-364
1376
    >>> isdir(bd)
1377
    False
1378
    """
622 by Martin Pool
Updated merge patch from Aaron
1379
    def __init__(self, files=[], dirs=[], base=None):
1 by mbp at sourcefrog
import from baz patch-364
1380
        """Make a test branch.
1381
1382
        This creates a temporary directory and runs init-tree in it.
1383
1384
        If any files are listed, they are created in the working copy.
1385
        """
800 by Martin Pool
Merge John's import-speedup branch:
1386
        from tempfile import mkdtemp
622 by Martin Pool
Updated merge patch from Aaron
1387
        init = False
1388
        if base is None:
800 by Martin Pool
Merge John's import-speedup branch:
1389
            base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1390
            init = True
1391
        Branch.__init__(self, base, init=init)
100 by mbp at sourcefrog
- add test case for ignore files
1392
        for d in dirs:
1393
            os.mkdir(self.abspath(d))
1394
            
1 by mbp at sourcefrog
import from baz patch-364
1395
        for f in files:
1396
            file(os.path.join(self.base, f), 'w').write('content of %s' % f)
1397
1398
622 by Martin Pool
Updated merge patch from Aaron
1399
    def clone(self):
1400
        """
1401
        >>> orig = ScratchBranch(files=["file1", "file2"])
1402
        >>> clone = orig.clone()
1403
        >>> os.path.samefile(orig.base, clone.base)
1404
        False
1405
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
1406
        True
1407
        """
800 by Martin Pool
Merge John's import-speedup branch:
1408
        from shutil import copytree
1409
        from tempfile import mkdtemp
1410
        base = mkdtemp()
622 by Martin Pool
Updated merge patch from Aaron
1411
        os.rmdir(base)
800 by Martin Pool
Merge John's import-speedup branch:
1412
        copytree(self.base, base, symlinks=True)
622 by Martin Pool
Updated merge patch from Aaron
1413
        return ScratchBranch(base=base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1414
1415
622 by Martin Pool
Updated merge patch from Aaron
1416
        
1 by mbp at sourcefrog
import from baz patch-364
1417
    def __del__(self):
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1418
        self.destroy()
1419
1420
    def destroy(self):
1 by mbp at sourcefrog
import from baz patch-364
1421
        """Destroy the test branch, removing the scratch directory."""
800 by Martin Pool
Merge John's import-speedup branch:
1422
        from shutil import rmtree
163 by mbp at sourcefrog
merge win32 portability fixes
1423
        try:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
1424
            if self.base:
1425
                mutter("delete ScratchBranch %s" % self.base)
800 by Martin Pool
Merge John's import-speedup branch:
1426
                rmtree(self.base)
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1427
        except OSError, e:
163 by mbp at sourcefrog
merge win32 portability fixes
1428
            # Work around for shutil.rmtree failing on Windows when
1429
            # readonly files are encountered
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1430
            mutter("hit exception in destroying ScratchBranch: %s" % e)
163 by mbp at sourcefrog
merge win32 portability fixes
1431
            for root, dirs, files in os.walk(self.base, topdown=False):
1432
                for name in files:
1433
                    os.chmod(os.path.join(root, name), 0700)
800 by Martin Pool
Merge John's import-speedup branch:
1434
            rmtree(self.base)
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
1435
        self.base = None
1 by mbp at sourcefrog
import from baz patch-364
1436
1437
    
1438
1439
######################################################################
1440
# predicates
1441
1442
1443
def is_control_file(filename):
1444
    ## FIXME: better check
1445
    filename = os.path.normpath(filename)
1446
    while filename != '':
1447
        head, tail = os.path.split(filename)
1448
        ## mutter('check %r for control file' % ((head, tail), ))
1449
        if tail == bzrlib.BZRDIR:
1450
            return True
70 by mbp at sourcefrog
Prepare for smart recursive add.
1451
        if filename == head:
1452
            break
1 by mbp at sourcefrog
import from baz patch-364
1453
        filename = head
1454
    return False
1455
1456
1457
70 by mbp at sourcefrog
Prepare for smart recursive add.
1458
def gen_file_id(name):
1 by mbp at sourcefrog
import from baz patch-364
1459
    """Return new file id.
1460
1461
    This should probably generate proper UUIDs, but for the moment we
1462
    cope with just randomness because running uuidgen every time is
1463
    slow."""
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1464
    import re
800 by Martin Pool
Merge John's import-speedup branch:
1465
    from binascii import hexlify
1466
    from time import time
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1467
1468
    # get last component
70 by mbp at sourcefrog
Prepare for smart recursive add.
1469
    idx = name.rfind('/')
1470
    if idx != -1:
1471
        name = name[idx+1 : ]
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
1472
    idx = name.rfind('\\')
1473
    if idx != -1:
1474
        name = name[idx+1 : ]
70 by mbp at sourcefrog
Prepare for smart recursive add.
1475
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1476
    # make it not a hidden file
70 by mbp at sourcefrog
Prepare for smart recursive add.
1477
    name = name.lstrip('.')
1478
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
1479
    # remove any wierd characters; we don't escape them but rather
1480
    # just pull them out
1481
    name = re.sub(r'[^\w.]', '', name)
1482
190 by mbp at sourcefrog
64 bits of randomness in file/revision ids
1483
    s = hexlify(rand_bytes(8))
800 by Martin Pool
Merge John's import-speedup branch:
1484
    return '-'.join((name, compact_date(time()), s))
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1485
1486
1487
def gen_root_id():
1488
    """Return a new tree-root file id."""
1489
    return gen_file_id('TREE_ROOT')
1490
1092.1.34 by Robert Collins
unbreak cmd_branch now that something tests the core of it..
1491
1492
def pull_loc(branch):
1493
    # TODO: Should perhaps just make attribute be 'base' in
1494
    # RemoteBranch and Branch?
1495
    if hasattr(branch, "baseurl"):
1496
        return branch.baseurl
1497
    else:
1498
        return branch.base
1499
1500
1501
def copy_branch(branch_from, to_location, revision=None):
1092.1.33 by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch
1502
    """Copy branch_from into the existing directory to_location.
1503
1151 by Martin Pool
- assertions and documentation for copy_branch
1504
    revision
1505
        If not None, only revisions up to this point will be copied.
1506
        The head of the new branch will be that revision.
1507
1508
    to_location
1509
        The name of a local directory that exists but is empty.
1092.1.33 by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch
1510
    """
1511
    from bzrlib.merge import merge
1512
    from bzrlib.branch import Branch
1151 by Martin Pool
- assertions and documentation for copy_branch
1513
1514
    assert isinstance(branch_from, Branch)
1515
    assert isinstance(to_location, basestring)
1516
    
1092.1.33 by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch
1517
    br_to = Branch(to_location, init=True)
1518
    br_to.set_root_id(branch_from.get_root_id())
1519
    if revision is None:
1520
        revno = branch_from.revno()
1521
    else:
1522
        revno, rev_id = branch_from.get_revision_info(revision)
1523
    br_to.update_revisions(branch_from, stop_revision=revno)
1524
    merge((to_location, -1), (to_location, 0), this_dir=to_location,
1525
          check_clean=False, ignore_zero=True)
1152 by Martin Pool
- add test that branching sets the parent of the new branch
1526
    
1092.1.33 by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch
1527
    from_location = pull_loc(branch_from)
1152 by Martin Pool
- add test that branching sets the parent of the new branch
1528
    br_to.set_parent(pull_loc(branch_from))
1092.1.33 by Robert Collins
pull the important stuff out of cmd_branch.run to branch.copy_branch
1529