/brz/remove-bazaar

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