/brz/remove-bazaar

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