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