~bzr-pqm/bzr/bzr.dev

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