/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
18
import sys, os, os.path, random, time, sha, sets, types, re, shutil, tempfile
19
import traceback, socket, fnmatch, difflib, time
20
from binascii import hexlify
21
22
import bzrlib
23
from inventory import Inventory
24
from trace import mutter, note
453 by Martin Pool
- Split WorkingTree into its own file
25
from tree import Tree, EmptyTree, RevisionTree
1 by mbp at sourcefrog
import from baz patch-364
26
from inventory import InventoryEntry, Inventory
319 by Martin Pool
- remove trivial chomp() function
27
from osutils import isdir, quotefn, isfile, uuid, sha_file, username, \
1 by mbp at sourcefrog
import from baz patch-364
28
     format_date, compact_date, pumpfile, user_email, rand_bytes, splitpath, \
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
29
     joinpath, sha_string, file_kind, local_time_offset, appendpath
1 by mbp at sourcefrog
import from baz patch-364
30
from store import ImmutableStore
31
from revision import Revision
576 by Martin Pool
- raise exceptions rather than using bailout()
32
from errors import BzrError
1 by mbp at sourcefrog
import from baz patch-364
33
from textui import show_status
34
35
BZR_BRANCH_FORMAT = "Bazaar-NG branch, format 0.0.4\n"
36
## TODO: Maybe include checks for common corruption of newlines, etc?
37
38
39
416 by Martin Pool
- bzr log and bzr root now accept an http URL
40
def find_branch(f, **args):
455 by Martin Pool
- fix 'bzr root'
41
    if f and (f.startswith('http://') or f.startswith('https://')):
416 by Martin Pool
- bzr log and bzr root now accept an http URL
42
        import remotebranch 
43
        return remotebranch.RemoteBranch(f, **args)
44
    else:
45
        return Branch(f, **args)
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
46
47
48
600 by Martin Pool
- Better Branch.relpath that doesn't match on
49
def _relpath(base, path):
50
    """Return path relative to base, or raise exception.
51
52
    The path may be either an absolute path or a path relative to the
53
    current working directory.
54
55
    Lifted out of Branch.relpath for ease of testing.
56
57
    os.path.commonprefix (python2.4) has a bad bug that it works just
58
    on string prefixes, assuming that '/u' is a prefix of '/u2'.  This
59
    avoids that problem."""
60
    rp = os.path.abspath(path)
61
62
    s = []
63
    head = rp
64
    while len(head) >= len(base):
65
        if head == base:
66
            break
67
        head, tail = os.path.split(head)
68
        if tail:
69
            s.insert(0, tail)
70
    else:
71
        from errors import NotBranchError
72
        raise NotBranchError("path %r is not within branch %r" % (rp, base))
73
74
    return os.sep.join(s)
416 by Martin Pool
- bzr log and bzr root now accept an http URL
75
        
76
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
77
def find_branch_root(f=None):
78
    """Find the branch root enclosing f, or pwd.
79
416 by Martin Pool
- bzr log and bzr root now accept an http URL
80
    f may be a filename or a URL.
81
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
82
    It is not necessary that f exists.
83
84
    Basically we keep looking up until we find the control directory or
85
    run into the root."""
184 by mbp at sourcefrog
pychecker fixups
86
    if f == None:
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
87
        f = os.getcwd()
88
    elif hasattr(os.path, 'realpath'):
89
        f = os.path.realpath(f)
90
    else:
91
        f = os.path.abspath(f)
425 by Martin Pool
- check from aaron for existence of a branch
92
    if not os.path.exists(f):
93
        raise BzrError('%r does not exist' % f)
94
        
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
95
96
    orig_f = f
97
98
    while True:
99
        if os.path.exists(os.path.join(f, bzrlib.BZRDIR)):
100
            return f
101
        head, tail = os.path.split(f)
102
        if head == f:
103
            # reached the root, whatever that may be
184 by mbp at sourcefrog
pychecker fixups
104
            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
105
        f = head
106
    
1 by mbp at sourcefrog
import from baz patch-364
107
108
109
######################################################################
110
# branch objects
111
558 by Martin Pool
- All top-level classes inherit from object
112
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
113
    """Branch holding a history of revisions.
114
343 by Martin Pool
doc
115
    base
116
        Base directory of the branch.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
117
118
    _lock_mode
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
119
        None, or 'r' or 'w'
120
121
    _lock_count
122
        If _lock_mode is true, a positive count of the number of times the
123
        lock has been taken.
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
124
614 by Martin Pool
- unify two defintions of LockError
125
    _lock
126
        Lock object from bzrlib.lock.
1 by mbp at sourcefrog
import from baz patch-364
127
    """
564 by Martin Pool
- Set Branch.base in class def to avoid it being undefined
128
    base = None
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
129
    _lock_mode = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
130
    _lock_count = None
615 by Martin Pool
Major rework of locking code:
131
    _lock = None
353 by Martin Pool
- Per-branch locks in read and write modes.
132
    
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
133
    def __init__(self, base, init=False, find_root=True):
1 by mbp at sourcefrog
import from baz patch-364
134
        """Create new branch object at a particular location.
135
254 by Martin Pool
- Doc cleanups from Magnus Therning
136
        base -- Base directory for the branch.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
137
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
138
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
139
             unversioned directory.  If False, the branch must already
140
             be versioned.
141
254 by Martin Pool
- Doc cleanups from Magnus Therning
142
        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
143
             existing branch containing base.
144
1 by mbp at sourcefrog
import from baz patch-364
145
        In the test suite, creation of new trees is tested using the
146
        `ScratchBranch` class.
147
        """
148
        if init:
64 by mbp at sourcefrog
- fix up init command for new find-branch-root function
149
            self.base = os.path.realpath(base)
1 by mbp at sourcefrog
import from baz patch-364
150
            self._make_control()
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
151
        elif find_root:
152
            self.base = find_branch_root(base)
1 by mbp at sourcefrog
import from baz patch-364
153
        else:
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
154
            self.base = os.path.realpath(base)
1 by mbp at sourcefrog
import from baz patch-364
155
            if not isdir(self.controlfilename('.')):
576 by Martin Pool
- raise exceptions rather than using bailout()
156
                from errors import NotBranchError
157
                raise NotBranchError("not a bzr branch: %s" % quotefn(base),
158
                                     ['use "bzr init" to initialize a new working tree',
159
                                      'current bzr can only operate from top-of-tree'])
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
160
        self._check_format()
1 by mbp at sourcefrog
import from baz patch-364
161
162
        self.text_store = ImmutableStore(self.controlfilename('text-store'))
163
        self.revision_store = ImmutableStore(self.controlfilename('revision-store'))
164
        self.inventory_store = ImmutableStore(self.controlfilename('inventory-store'))
165
166
167
    def __str__(self):
168
        return '%s(%r)' % (self.__class__.__name__, self.base)
169
170
171
    __repr__ = __str__
172
173
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
174
    def __del__(self):
615 by Martin Pool
Major rework of locking code:
175
        if self._lock_mode or self._lock:
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
176
            from warnings import warn
177
            warn("branch %r was not explicitly unlocked" % self)
615 by Martin Pool
Major rework of locking code:
178
            self._lock.unlock()
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
179
180
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
181
182
    def lock_write(self):
183
        if self._lock_mode:
184
            if self._lock_mode != 'w':
185
                from errors import LockError
186
                raise LockError("can't upgrade to a write lock from %r" %
187
                                self._lock_mode)
188
            self._lock_count += 1
189
        else:
615 by Martin Pool
Major rework of locking code:
190
            from bzrlib.lock import WriteLock
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
191
615 by Martin Pool
Major rework of locking code:
192
            self._lock = WriteLock(self.controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
193
            self._lock_mode = 'w'
194
            self._lock_count = 1
195
196
197
198
    def lock_read(self):
199
        if self._lock_mode:
200
            assert self._lock_mode in ('r', 'w'), \
201
                   "invalid lock mode %r" % self._lock_mode
202
            self._lock_count += 1
203
        else:
615 by Martin Pool
Major rework of locking code:
204
            from bzrlib.lock import ReadLock
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
205
615 by Martin Pool
Major rework of locking code:
206
            self._lock = ReadLock(self.controlfilename('branch-lock'))
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
207
            self._lock_mode = 'r'
208
            self._lock_count = 1
209
                        
210
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
211
            
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
212
    def unlock(self):
213
        if not self._lock_mode:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
214
            from errors import LockError
215
            raise LockError('branch %r is not locked' % (self))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
216
217
        if self._lock_count > 1:
218
            self._lock_count -= 1
219
        else:
615 by Martin Pool
Major rework of locking code:
220
            self._lock.unlock()
221
            self._lock = None
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
222
            self._lock_mode = self._lock_count = None
353 by Martin Pool
- Per-branch locks in read and write modes.
223
224
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
225
    def abspath(self, name):
226
        """Return absolute filename for something in the branch"""
1 by mbp at sourcefrog
import from baz patch-364
227
        return os.path.join(self.base, name)
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
228
1 by mbp at sourcefrog
import from baz patch-364
229
68 by mbp at sourcefrog
- new relpath command and function
230
    def relpath(self, path):
231
        """Return path relative to this branch of something inside it.
232
233
        Raises an error if path is not in this branch."""
600 by Martin Pool
- Better Branch.relpath that doesn't match on
234
        return _relpath(self.base, path)
68 by mbp at sourcefrog
- new relpath command and function
235
236
1 by mbp at sourcefrog
import from baz patch-364
237
    def controlfilename(self, file_or_path):
238
        """Return location relative to branch."""
239
        if isinstance(file_or_path, types.StringTypes):
240
            file_or_path = [file_or_path]
241
        return os.path.join(self.base, bzrlib.BZRDIR, *file_or_path)
242
243
244
    def controlfile(self, file_or_path, mode='r'):
245 by mbp at sourcefrog
- control files always in utf-8-unix format
245
        """Open a control file for this branch.
246
247
        There are two classes of file in the control directory: text
248
        and binary.  binary files are untranslated byte streams.  Text
249
        control files are stored with Unix newlines and in UTF-8, even
250
        if the platform or locale defaults are different.
430 by Martin Pool
doc
251
252
        Controlfiles should almost never be opened in write mode but
253
        rather should be atomically copied and replaced using atomicfile.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
254
        """
255
256
        fn = self.controlfilename(file_or_path)
257
258
        if mode == 'rb' or mode == 'wb':
259
            return file(fn, mode)
260
        elif mode == 'r' or mode == 'w':
259 by Martin Pool
- use larger file buffers when opening branch control file
261
            # open in binary mode anyhow so there's no newline translation;
262
            # codecs uses line buffering by default; don't want that.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
263
            import codecs
259 by Martin Pool
- use larger file buffers when opening branch control file
264
            return codecs.open(fn, mode + 'b', 'utf-8',
265
                               buffering=60000)
245 by mbp at sourcefrog
- control files always in utf-8-unix format
266
        else:
267
            raise BzrError("invalid controlfile mode %r" % mode)
268
1 by mbp at sourcefrog
import from baz patch-364
269
270
271
    def _make_control(self):
272
        os.mkdir(self.controlfilename([]))
273
        self.controlfile('README', 'w').write(
274
            "This is a Bazaar-NG control directory.\n"
275
            "Do not change any files in this directory.")
245 by mbp at sourcefrog
- control files always in utf-8-unix format
276
        self.controlfile('branch-format', 'w').write(BZR_BRANCH_FORMAT)
1 by mbp at sourcefrog
import from baz patch-364
277
        for d in ('text-store', 'inventory-store', 'revision-store'):
278
            os.mkdir(self.controlfilename(d))
279
        for f in ('revision-history', 'merged-patches',
353 by Martin Pool
- Per-branch locks in read and write modes.
280
                  'pending-merged-patches', 'branch-name',
281
                  'branch-lock'):
1 by mbp at sourcefrog
import from baz patch-364
282
            self.controlfile(f, 'w').write('')
283
        mutter('created control directory in ' + self.base)
284
        Inventory().write_xml(self.controlfile('inventory','w'))
285
286
287
    def _check_format(self):
288
        """Check this branch format is supported.
289
290
        The current tool only supports the current unstable format.
291
292
        In the future, we might need different in-memory Branch
293
        classes to support downlevel branches.  But not yet.
163 by mbp at sourcefrog
merge win32 portability fixes
294
        """
295
        # This ignores newlines so that we can open branches created
296
        # on Windows from Linux and so on.  I think it might be better
297
        # to always make all internal files in unix format.
245 by mbp at sourcefrog
- control files always in utf-8-unix format
298
        fmt = self.controlfile('branch-format', 'r').read()
163 by mbp at sourcefrog
merge win32 portability fixes
299
        fmt.replace('\r\n', '')
1 by mbp at sourcefrog
import from baz patch-364
300
        if fmt != BZR_BRANCH_FORMAT:
576 by Martin Pool
- raise exceptions rather than using bailout()
301
            raise BzrError('sorry, branch format %r not supported' % fmt,
302
                           ['use a different bzr version',
303
                            'or remove the .bzr directory and "bzr init" again'])
1 by mbp at sourcefrog
import from baz patch-364
304
305
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
306
1 by mbp at sourcefrog
import from baz patch-364
307
    def read_working_inventory(self):
308
        """Read the working inventory."""
309
        before = time.time()
245 by mbp at sourcefrog
- control files always in utf-8-unix format
310
        # ElementTree does its own conversion from UTF-8, so open in
311
        # binary.
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
312
        self.lock_read()
313
        try:
314
            inv = Inventory.read_xml(self.controlfile('inventory', 'rb'))
315
            mutter("loaded inventory of %d items in %f"
316
                   % (len(inv), time.time() - before))
317
            return inv
318
        finally:
319
            self.unlock()
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
320
            
1 by mbp at sourcefrog
import from baz patch-364
321
322
    def _write_inventory(self, inv):
323
        """Update the working inventory.
324
325
        That is to say, the inventory describing changes underway, that
326
        will be committed to the next revision.
327
        """
14 by mbp at sourcefrog
write inventory to temporary file and atomically replace
328
        ## TODO: factor out to atomicfile?  is rename safe on windows?
70 by mbp at sourcefrog
Prepare for smart recursive add.
329
        ## TODO: Maybe some kind of clean/dirty marker on inventory?
14 by mbp at sourcefrog
write inventory to temporary file and atomically replace
330
        tmpfname = self.controlfilename('inventory.tmp')
245 by mbp at sourcefrog
- control files always in utf-8-unix format
331
        tmpf = file(tmpfname, 'wb')
14 by mbp at sourcefrog
write inventory to temporary file and atomically replace
332
        inv.write_xml(tmpf)
333
        tmpf.close()
163 by mbp at sourcefrog
merge win32 portability fixes
334
        inv_fname = self.controlfilename('inventory')
335
        if sys.platform == 'win32':
336
            os.remove(inv_fname)
337
        os.rename(tmpfname, inv_fname)
14 by mbp at sourcefrog
write inventory to temporary file and atomically replace
338
        mutter('wrote working inventory')
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
339
            
1 by mbp at sourcefrog
import from baz patch-364
340
341
    inventory = property(read_working_inventory, _write_inventory, None,
342
                         """Inventory for the working copy.""")
343
344
493 by Martin Pool
- Merge aaron's merge command
345
    def add(self, files, verbose=False, ids=None):
1 by mbp at sourcefrog
import from baz patch-364
346
        """Make files versioned.
347
247 by mbp at sourcefrog
doc
348
        Note that the command line normally calls smart_add instead.
349
1 by mbp at sourcefrog
import from baz patch-364
350
        This puts the files in the Added state, so that they will be
351
        recorded by the next commit.
352
596 by Martin Pool
doc
353
        files
354
            List of paths to add, relative to the base of the tree.
355
356
        ids
357
            If set, use these instead of automatically generated ids.
358
            Must be the same length as the list of files, but may
359
            contain None for ids that are to be autogenerated.
360
254 by Martin Pool
- Doc cleanups from Magnus Therning
361
        TODO: Perhaps have an option to add the ids even if the files do
596 by Martin Pool
doc
362
              not (yet) exist.
1 by mbp at sourcefrog
import from baz patch-364
363
254 by Martin Pool
- Doc cleanups from Magnus Therning
364
        TODO: Perhaps return the ids of the files?  But then again it
596 by Martin Pool
doc
365
              is easy to retrieve them if they're needed.
1 by mbp at sourcefrog
import from baz patch-364
366
254 by Martin Pool
- Doc cleanups from Magnus Therning
367
        TODO: Adding a directory should optionally recurse down and
596 by Martin Pool
doc
368
              add all non-ignored children.  Perhaps do that in a
369
              higher-level method.
1 by mbp at sourcefrog
import from baz patch-364
370
        """
371
        # TODO: Re-adding a file that is removed in the working copy
372
        # should probably put it back with the previous ID.
373
        if isinstance(files, types.StringTypes):
493 by Martin Pool
- Merge aaron's merge command
374
            assert(ids is None or isinstance(ids, types.StringTypes))
1 by mbp at sourcefrog
import from baz patch-364
375
            files = [files]
493 by Martin Pool
- Merge aaron's merge command
376
            if ids is not None:
377
                ids = [ids]
378
379
        if ids is None:
380
            ids = [None] * len(files)
381
        else:
382
            assert(len(ids) == len(files))
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
383
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
384
        self.lock_write()
385
        try:
386
            inv = self.read_working_inventory()
387
            for f,file_id in zip(files, ids):
388
                if is_control_file(f):
389
                    raise BzrError("cannot add control file %s" % quotefn(f))
390
391
                fp = splitpath(f)
392
393
                if len(fp) == 0:
394
                    raise BzrError("cannot add top-level %r" % f)
395
396
                fullpath = os.path.normpath(self.abspath(f))
397
398
                try:
399
                    kind = file_kind(fullpath)
400
                except OSError:
401
                    # maybe something better?
402
                    raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
403
404
                if kind != 'file' and kind != 'directory':
405
                    raise BzrError('cannot add: not a regular file or directory: %s' % quotefn(f))
406
407
                if file_id is None:
408
                    file_id = gen_file_id(f)
409
                inv.add_path(f, kind=kind, file_id=file_id)
410
411
                if verbose:
412
                    show_status('A', kind, quotefn(f))
413
414
                mutter("add file %s file_id:{%s} kind=%r" % (f, file_id, kind))
415
416
            self._write_inventory(inv)
417
        finally:
418
            self.unlock()
70 by mbp at sourcefrog
Prepare for smart recursive add.
419
            
1 by mbp at sourcefrog
import from baz patch-364
420
176 by mbp at sourcefrog
New cat command contributed by janmar.
421
    def print_file(self, file, revno):
422
        """Print `file` to stdout."""
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
423
        self.lock_read()
424
        try:
425
            tree = self.revision_tree(self.lookup_revision(revno))
426
            # use inventory as it was in that revision
427
            file_id = tree.inventory.path2id(file)
428
            if not file_id:
429
                raise BzrError("%r is not present in revision %d" % (file, revno))
430
            tree.print_file(file_id)
431
        finally:
432
            self.unlock()
433
434
1 by mbp at sourcefrog
import from baz patch-364
435
    def remove(self, files, verbose=False):
436
        """Mark nominated files for removal from the inventory.
437
438
        This does not remove their text.  This does not run on 
439
254 by Martin Pool
- Doc cleanups from Magnus Therning
440
        TODO: Refuse to remove modified files unless --force is given?
1 by mbp at sourcefrog
import from baz patch-364
441
254 by Martin Pool
- Doc cleanups from Magnus Therning
442
        TODO: Do something useful with directories.
1 by mbp at sourcefrog
import from baz patch-364
443
254 by Martin Pool
- Doc cleanups from Magnus Therning
444
        TODO: Should this remove the text or not?  Tough call; not
1 by mbp at sourcefrog
import from baz patch-364
445
        removing may be useful and the user can just use use rm, and
446
        is the opposite of add.  Removing it is consistent with most
447
        other tools.  Maybe an option.
448
        """
449
        ## TODO: Normalize names
450
        ## TODO: Remove nested loops; better scalability
451
        if isinstance(files, types.StringTypes):
452
            files = [files]
580 by Martin Pool
- Use explicit lock methods on a branch, rather than doing it
453
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
454
        self.lock_write()
455
456
        try:
457
            tree = self.working_tree()
458
            inv = tree.inventory
459
460
            # do this before any modifications
461
            for f in files:
462
                fid = inv.path2id(f)
463
                if not fid:
464
                    raise BzrError("cannot remove unversioned file %s" % quotefn(f))
465
                mutter("remove inventory entry %s {%s}" % (quotefn(f), fid))
466
                if verbose:
467
                    # having remove it, it must be either ignored or unknown
468
                    if tree.is_ignored(f):
469
                        new_status = 'I'
470
                    else:
471
                        new_status = '?'
472
                    show_status(new_status, inv[fid].kind, quotefn(f))
473
                del inv[fid]
474
475
            self._write_inventory(inv)
476
        finally:
477
            self.unlock()
478
479
612 by Martin Pool
doc
480
    # FIXME: this doesn't need to be a branch method
493 by Martin Pool
- Merge aaron's merge command
481
    def set_inventory(self, new_inventory_list):
482
        inv = Inventory()
483
        for path, file_id, parent, kind in new_inventory_list:
484
            name = os.path.basename(path)
485
            if name == "":
486
                continue
487
            inv.add(InventoryEntry(file_id, name, kind, parent))
488
        self._write_inventory(inv)
489
1 by mbp at sourcefrog
import from baz patch-364
490
491
    def unknowns(self):
492
        """Return all unknown files.
493
494
        These are files in the working directory that are not versioned or
495
        control files or ignored.
496
        
497
        >>> b = ScratchBranch(files=['foo', 'foo~'])
498
        >>> list(b.unknowns())
499
        ['foo']
500
        >>> b.add('foo')
501
        >>> list(b.unknowns())
502
        []
503
        >>> b.remove('foo')
504
        >>> list(b.unknowns())
505
        ['foo']
506
        """
507
        return self.working_tree().unknowns()
508
509
233 by mbp at sourcefrog
- more output from test.sh
510
    def append_revision(self, revision_id):
511
        mutter("add {%s} to revision-history" % revision_id)
512
        rev_history = self.revision_history()
513
514
        tmprhname = self.controlfilename('revision-history.tmp')
515
        rhname = self.controlfilename('revision-history')
516
        
517
        f = file(tmprhname, 'wt')
518
        rev_history.append(revision_id)
519
        f.write('\n'.join(rev_history))
520
        f.write('\n')
521
        f.close()
522
523
        if sys.platform == 'win32':
524
            os.remove(rhname)
525
        os.rename(tmprhname, rhname)
526
        
527
528
1 by mbp at sourcefrog
import from baz patch-364
529
    def get_revision(self, revision_id):
530
        """Return the Revision object for a named revision"""
531
        r = Revision.read_xml(self.revision_store[revision_id])
532
        assert r.revision_id == revision_id
533
        return r
534
535
536
    def get_inventory(self, inventory_id):
537
        """Get Inventory object by hash.
538
254 by Martin Pool
- Doc cleanups from Magnus Therning
539
        TODO: Perhaps for this and similar methods, take a revision
1 by mbp at sourcefrog
import from baz patch-364
540
               parameter which can be either an integer revno or a
541
               string hash."""
542
        i = Inventory.read_xml(self.inventory_store[inventory_id])
543
        return i
544
545
546
    def get_revision_inventory(self, revision_id):
547
        """Return inventory of a past revision."""
548
        if revision_id == None:
549
            return Inventory()
550
        else:
551
            return self.get_inventory(self.get_revision(revision_id).inventory_id)
552
553
554
    def revision_history(self):
555
        """Return sequence of revision hashes on to this branch.
556
557
        >>> ScratchBranch().revision_history()
558
        []
559
        """
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
560
        self.lock_read()
561
        try:
562
            return [l.rstrip('\r\n') for l in
563
                    self.controlfile('revision-history', 'r').readlines()]
564
        finally:
565
            self.unlock()
1 by mbp at sourcefrog
import from baz patch-364
566
567
622 by Martin Pool
Updated merge patch from Aaron
568
    def common_ancestor(self, other, self_revno=None, other_revno=None):
569
        """
570
        >>> import commit
571
        >>> sb = ScratchBranch(files=['foo', 'foo~'])
572
        >>> sb.common_ancestor(sb) == (None, None)
573
        True
574
        >>> commit.commit(sb, "Committing first revision", verbose=False)
575
        >>> sb.common_ancestor(sb)[0]
576
        1
577
        >>> clone = sb.clone()
578
        >>> commit.commit(sb, "Committing second revision", verbose=False)
579
        >>> sb.common_ancestor(sb)[0]
580
        2
581
        >>> sb.common_ancestor(clone)[0]
582
        1
583
        >>> commit.commit(clone, "Committing divergent second revision", 
584
        ...               verbose=False)
585
        >>> sb.common_ancestor(clone)[0]
586
        1
587
        >>> sb.common_ancestor(clone) == clone.common_ancestor(sb)
588
        True
589
        >>> sb.common_ancestor(sb) != clone.common_ancestor(clone)
590
        True
591
        >>> clone2 = sb.clone()
592
        >>> sb.common_ancestor(clone2)[0]
593
        2
594
        >>> sb.common_ancestor(clone2, self_revno=1)[0]
595
        1
596
        >>> sb.common_ancestor(clone2, other_revno=1)[0]
597
        1
598
        """
599
        my_history = self.revision_history()
600
        other_history = other.revision_history()
601
        if self_revno is None:
602
            self_revno = len(my_history)
603
        if other_revno is None:
604
            other_revno = len(other_history)
605
        indices = range(min((self_revno, other_revno)))
606
        indices.reverse()
607
        for r in indices:
608
            if my_history[r] == other_history[r]:
609
                return r+1, my_history[r]
610
        return None, None
611
385 by Martin Pool
- New Branch.enum_history method
612
    def enum_history(self, direction):
613
        """Return (revno, revision_id) for history of branch.
614
615
        direction
616
            'forward' is from earliest to latest
617
            'reverse' is from latest to earliest
618
        """
619
        rh = self.revision_history()
620
        if direction == 'forward':
621
            i = 1
622
            for rid in rh:
623
                yield i, rid
624
                i += 1
625
        elif direction == 'reverse':
626
            i = len(rh)
627
            while i > 0:
628
                yield i, rh[i-1]
629
                i -= 1
630
        else:
526 by Martin Pool
- use ValueError for bad internal parameters
631
            raise ValueError('invalid history direction', direction)
385 by Martin Pool
- New Branch.enum_history method
632
633
1 by mbp at sourcefrog
import from baz patch-364
634
    def revno(self):
635
        """Return current revision number for this branch.
636
637
        That is equivalent to the number of revisions committed to
638
        this branch.
639
        """
640
        return len(self.revision_history())
641
642
643
    def last_patch(self):
644
        """Return last patch hash, or None if no history.
645
        """
646
        ph = self.revision_history()
647
        if ph:
648
            return ph[-1]
184 by mbp at sourcefrog
pychecker fixups
649
        else:
650
            return None
485 by Martin Pool
- move commit code into its own module
651
652
653
    def commit(self, *args, **kw):
654
        """Deprecated"""
655
        from bzrlib.commit import commit
656
        commit(self, *args, **kw)
184 by mbp at sourcefrog
pychecker fixups
657
        
1 by mbp at sourcefrog
import from baz patch-364
658
659
    def lookup_revision(self, revno):
660
        """Return revision hash for revision number."""
661
        if revno == 0:
662
            return None
663
664
        try:
665
            # list is 0-based; revisions are 1-based
666
            return self.revision_history()[revno-1]
667
        except IndexError:
184 by mbp at sourcefrog
pychecker fixups
668
            raise BzrError("no such revision %s" % revno)
1 by mbp at sourcefrog
import from baz patch-364
669
670
671
    def revision_tree(self, revision_id):
672
        """Return Tree for a revision on this branch.
673
674
        `revision_id` may be None for the null revision, in which case
675
        an `EmptyTree` is returned."""
529 by Martin Pool
todo
676
        # TODO: refactor this to use an existing revision object
677
        # so we don't need to read it in twice.
1 by mbp at sourcefrog
import from baz patch-364
678
        if revision_id == None:
679
            return EmptyTree()
680
        else:
681
            inv = self.get_revision_inventory(revision_id)
682
            return RevisionTree(self.text_store, inv)
683
684
685
    def working_tree(self):
686
        """Return a `Tree` for the working copy."""
453 by Martin Pool
- Split WorkingTree into its own file
687
        from workingtree import WorkingTree
1 by mbp at sourcefrog
import from baz patch-364
688
        return WorkingTree(self.base, self.read_working_inventory())
689
690
691
    def basis_tree(self):
692
        """Return `Tree` object for last revision.
693
694
        If there are no revisions yet, return an `EmptyTree`.
695
        """
696
        r = self.last_patch()
697
        if r == None:
698
            return EmptyTree()
699
        else:
700
            return RevisionTree(self.text_store, self.get_revision_inventory(r))
701
702
703
168 by mbp at sourcefrog
new "rename" command
704
    def rename_one(self, from_rel, to_rel):
309 by Martin Pool
doc
705
        """Rename one file.
706
707
        This can change the directory or the filename or both.
353 by Martin Pool
- Per-branch locks in read and write modes.
708
        """
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
709
        self.lock_write()
171 by mbp at sourcefrog
better error message when working file rename fails
710
        try:
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
711
            tree = self.working_tree()
712
            inv = tree.inventory
713
            if not tree.has_filename(from_rel):
714
                raise BzrError("can't rename: old working file %r does not exist" % from_rel)
715
            if tree.has_filename(to_rel):
716
                raise BzrError("can't rename: new working file %r already exists" % to_rel)
717
718
            file_id = inv.path2id(from_rel)
719
            if file_id == None:
720
                raise BzrError("can't rename: old name %r is not versioned" % from_rel)
721
722
            if inv.path2id(to_rel):
723
                raise BzrError("can't rename: new name %r is already versioned" % to_rel)
724
725
            to_dir, to_tail = os.path.split(to_rel)
726
            to_dir_id = inv.path2id(to_dir)
727
            if to_dir_id == None and to_dir != '':
728
                raise BzrError("can't determine destination directory id for %r" % to_dir)
729
730
            mutter("rename_one:")
731
            mutter("  file_id    {%s}" % file_id)
732
            mutter("  from_rel   %r" % from_rel)
733
            mutter("  to_rel     %r" % to_rel)
734
            mutter("  to_dir     %r" % to_dir)
735
            mutter("  to_dir_id  {%s}" % to_dir_id)
736
737
            inv.rename(file_id, to_dir_id, to_tail)
738
739
            print "%s => %s" % (from_rel, to_rel)
740
741
            from_abs = self.abspath(from_rel)
742
            to_abs = self.abspath(to_rel)
743
            try:
744
                os.rename(from_abs, to_abs)
745
            except OSError, e:
746
                raise BzrError("failed to rename %r to %r: %s"
747
                        % (from_abs, to_abs, e[1]),
748
                        ["rename rolled back"])
749
750
            self._write_inventory(inv)
751
        finally:
752
            self.unlock()
753
754
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
755
    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
756
        """Rename files.
757
174 by mbp at sourcefrog
- New 'move' command; now separated out from rename
758
        to_name must exist as a versioned directory.
759
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
760
        If to_name exists and is a directory, the files are moved into
761
        it, keeping their old names.  If it is a directory, 
762
763
        Note that to_name is only the last component of the new name;
764
        this doesn't change the directory.
765
        """
611 by Martin Pool
- remove @with_writelock, @with_readlock decorators
766
        self.lock_write()
767
        try:
768
            ## TODO: Option to move IDs only
769
            assert not isinstance(from_paths, basestring)
770
            tree = self.working_tree()
771
            inv = tree.inventory
772
            to_abs = self.abspath(to_name)
773
            if not isdir(to_abs):
774
                raise BzrError("destination %r is not a directory" % to_abs)
775
            if not tree.has_filename(to_name):
776
                raise BzrError("destination %r not in working directory" % to_abs)
777
            to_dir_id = inv.path2id(to_name)
778
            if to_dir_id == None and to_name != '':
779
                raise BzrError("destination %r is not a versioned directory" % to_name)
780
            to_dir_ie = inv[to_dir_id]
781
            if to_dir_ie.kind not in ('directory', 'root_directory'):
782
                raise BzrError("destination %r is not a directory" % to_abs)
783
784
            to_idpath = inv.get_idpath(to_dir_id)
785
786
            for f in from_paths:
787
                if not tree.has_filename(f):
788
                    raise BzrError("%r does not exist in working tree" % f)
789
                f_id = inv.path2id(f)
790
                if f_id == None:
791
                    raise BzrError("%r is not versioned" % f)
792
                name_tail = splitpath(f)[-1]
793
                dest_path = appendpath(to_name, name_tail)
794
                if tree.has_filename(dest_path):
795
                    raise BzrError("destination %r already exists" % dest_path)
796
                if f_id in to_idpath:
797
                    raise BzrError("can't move %r to a subdirectory of itself" % f)
798
799
            # OK, so there's a race here, it's possible that someone will
800
            # create a file in this interval and then the rename might be
801
            # left half-done.  But we should have caught most problems.
802
803
            for f in from_paths:
804
                name_tail = splitpath(f)[-1]
805
                dest_path = appendpath(to_name, name_tail)
806
                print "%s => %s" % (f, dest_path)
807
                inv.rename(inv.path2id(f), to_dir_id, name_tail)
808
                try:
809
                    os.rename(self.abspath(f), self.abspath(dest_path))
810
                except OSError, e:
811
                    raise BzrError("failed to rename %r to %r: %s" % (f, dest_path, e[1]),
812
                            ["rename rolled back"])
813
814
            self._write_inventory(inv)
815
        finally:
816
            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
817
818
1 by mbp at sourcefrog
import from baz patch-364
819
820
class ScratchBranch(Branch):
821
    """Special test class: a branch that cleans up after itself.
822
823
    >>> b = ScratchBranch()
824
    >>> isdir(b.base)
825
    True
826
    >>> bd = b.base
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
827
    >>> b.destroy()
1 by mbp at sourcefrog
import from baz patch-364
828
    >>> isdir(bd)
829
    False
830
    """
622 by Martin Pool
Updated merge patch from Aaron
831
    def __init__(self, files=[], dirs=[], base=None):
1 by mbp at sourcefrog
import from baz patch-364
832
        """Make a test branch.
833
834
        This creates a temporary directory and runs init-tree in it.
835
836
        If any files are listed, they are created in the working copy.
837
        """
622 by Martin Pool
Updated merge patch from Aaron
838
        init = False
839
        if base is None:
840
            base = tempfile.mkdtemp()
841
            init = True
842
        Branch.__init__(self, base, init=init)
100 by mbp at sourcefrog
- add test case for ignore files
843
        for d in dirs:
844
            os.mkdir(self.abspath(d))
845
            
1 by mbp at sourcefrog
import from baz patch-364
846
        for f in files:
847
            file(os.path.join(self.base, f), 'w').write('content of %s' % f)
848
849
622 by Martin Pool
Updated merge patch from Aaron
850
    def clone(self):
851
        """
852
        >>> orig = ScratchBranch(files=["file1", "file2"])
853
        >>> clone = orig.clone()
854
        >>> os.path.samefile(orig.base, clone.base)
855
        False
856
        >>> os.path.isfile(os.path.join(clone.base, "file1"))
857
        True
858
        """
859
        base = tempfile.mkdtemp()
860
        os.rmdir(base)
861
        shutil.copytree(self.base, base, symlinks=True)
862
        return ScratchBranch(base=base)
863
        
1 by mbp at sourcefrog
import from baz patch-364
864
    def __del__(self):
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
865
        self.destroy()
866
867
    def destroy(self):
1 by mbp at sourcefrog
import from baz patch-364
868
        """Destroy the test branch, removing the scratch directory."""
163 by mbp at sourcefrog
merge win32 portability fixes
869
        try:
610 by Martin Pool
- replace Branch.lock(mode) with separate lock_read and lock_write
870
            if self.base:
871
                mutter("delete ScratchBranch %s" % self.base)
872
                shutil.rmtree(self.base)
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
873
        except OSError, e:
163 by mbp at sourcefrog
merge win32 portability fixes
874
            # Work around for shutil.rmtree failing on Windows when
875
            # readonly files are encountered
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
876
            mutter("hit exception in destroying ScratchBranch: %s" % e)
163 by mbp at sourcefrog
merge win32 portability fixes
877
            for root, dirs, files in os.walk(self.base, topdown=False):
878
                for name in files:
879
                    os.chmod(os.path.join(root, name), 0700)
880
            shutil.rmtree(self.base)
396 by Martin Pool
- Using the destructor on a ScratchBranch is not reliable;
881
        self.base = None
1 by mbp at sourcefrog
import from baz patch-364
882
883
    
884
885
######################################################################
886
# predicates
887
888
889
def is_control_file(filename):
890
    ## FIXME: better check
891
    filename = os.path.normpath(filename)
892
    while filename != '':
893
        head, tail = os.path.split(filename)
894
        ## mutter('check %r for control file' % ((head, tail), ))
895
        if tail == bzrlib.BZRDIR:
896
            return True
70 by mbp at sourcefrog
Prepare for smart recursive add.
897
        if filename == head:
898
            break
1 by mbp at sourcefrog
import from baz patch-364
899
        filename = head
900
    return False
901
902
903
70 by mbp at sourcefrog
Prepare for smart recursive add.
904
def gen_file_id(name):
1 by mbp at sourcefrog
import from baz patch-364
905
    """Return new file id.
906
907
    This should probably generate proper UUIDs, but for the moment we
908
    cope with just randomness because running uuidgen every time is
909
    slow."""
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
910
    import re
911
912
    # get last component
70 by mbp at sourcefrog
Prepare for smart recursive add.
913
    idx = name.rfind('/')
914
    if idx != -1:
915
        name = name[idx+1 : ]
262 by Martin Pool
- gen_file_id: break the file on either / or \ when looking
916
    idx = name.rfind('\\')
917
    if idx != -1:
918
        name = name[idx+1 : ]
70 by mbp at sourcefrog
Prepare for smart recursive add.
919
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
920
    # make it not a hidden file
70 by mbp at sourcefrog
Prepare for smart recursive add.
921
    name = name.lstrip('.')
922
535 by Martin Pool
- try to eliminate wierd characters from file names when they're
923
    # remove any wierd characters; we don't escape them but rather
924
    # just pull them out
925
    name = re.sub(r'[^\w.]', '', name)
926
190 by mbp at sourcefrog
64 bits of randomness in file/revision ids
927
    s = hexlify(rand_bytes(8))
1 by mbp at sourcefrog
import from baz patch-364
928
    return '-'.join((name, compact_date(time.time()), s))