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