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