/brz/remove-bazaar

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