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