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