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