/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1
# Copyright (C) 2005, 2006 Canonical Ltd
1553.5.70 by Martin Pool
doc
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.
1553.5.70 by Martin Pool
doc
7
#
1 by mbp at sourcefrog
import from baz patch-364
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.
1553.5.70 by Martin Pool
doc
12
#
1 by mbp at sourcefrog
import from baz patch-364
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
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
18
from copy import deepcopy
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
19
from cStringIO import StringIO
20
import errno
21
import os
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
22
import shutil
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
23
import sys
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
24
from unittest import TestSuite
1372 by Martin Pool
- avoid converting inventories to/from StringIO
25
from warnings import warn
1553.5.70 by Martin Pool
doc
26
1 by mbp at sourcefrog
import from baz patch-364
27
import bzrlib
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
28
import bzrlib.bzrdir as bzrdir
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
29
from bzrlib.config import TreeConfig
1534.4.28 by Robert Collins
first cut at merge from integration.
30
from bzrlib.decorators import needs_read_lock, needs_write_lock
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
31
import bzrlib.errors as errors
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
32
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches, 
33
                           HistoryMissing, InvalidRevisionId, 
34
                           InvalidRevisionNumber, LockError, NoSuchFile, 
35
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
36
                           NotBranchError, UninitializableFormat, 
37
                           UnlistableStore, UnlistableBranch, 
38
                           )
1185.65.15 by Robert Collins
Merge from integration.
39
import bzrlib.inventory as inventory
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
40
from bzrlib.inventory import Inventory
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
41
from bzrlib.lockable_files import LockableFiles, TransportLock
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
42
from bzrlib.lockdir import LockDir
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
43
from bzrlib.osutils import (isdir, quotefn,
1185.31.32 by John Arbash Meinel
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \
44
                            rename, splitpath, sha_file,
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
45
                            file_kind, abspath, normpath, pathjoin,
46
                            safe_unicode,
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
47
                            rmtree,
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
48
                            )
1534.4.28 by Robert Collins
first cut at merge from integration.
49
from bzrlib.repository import Repository
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
50
from bzrlib.revision import (
51
                             is_ancestor,
52
                             NULL_REVISION,
53
                             Revision,
54
                             )
1393.2.1 by John Arbash Meinel
Merged in split-storage-2 branch. Need to cleanup a little bit more still.
55
from bzrlib.store import copy_all
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
56
from bzrlib.symbol_versioning import *
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
57
from bzrlib.textui import show_status
58
from bzrlib.trace import mutter, note
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
59
import bzrlib.transactions as transactions
1393.2.4 by John Arbash Meinel
All tests pass.
60
from bzrlib.transport import Transport, get_transport
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
61
import bzrlib.ui
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
62
import bzrlib.urlutils as urlutils
1189 by Martin Pool
- BROKEN: partial support for commit into weave
63
import bzrlib.xml5
1104 by Martin Pool
- Add a simple UIFactory
64
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
65
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
66
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
67
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1429 by Robert Collins
merge in niemeyers prefixed-store patch
68
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
69
70
71
# TODO: Maybe include checks for common corruption of newlines, etc?
1 by mbp at sourcefrog
import from baz patch-364
72
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
73
# TODO: Some operations like log might retrieve the same revisions
74
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
75
# cache in memory to make this faster.  In general anything can be
1185.65.29 by Robert Collins
Implement final review suggestions.
76
# cached in memory between lock and unlock operations. .. nb thats
77
# what the transaction identity map provides
416 by Martin Pool
- bzr log and bzr root now accept an http URL
78
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
79
1 by mbp at sourcefrog
import from baz patch-364
80
######################################################################
81
# branch objects
82
558 by Martin Pool
- All top-level classes inherit from object
83
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
84
    """Branch holding a history of revisions.
85
343 by Martin Pool
doc
86
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
87
        Base directory/url of the branch.
88
    """
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
89
    # this is really an instance variable - FIXME move it there
90
    # - RBC 20060112
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
91
    base = None
92
93
    def __init__(self, *ignored, **ignored_too):
94
        raise NotImplementedError('The Branch class is abstract')
95
1687.1.8 by Robert Collins
Teach Branch about break_lock.
96
    def break_lock(self):
97
        """Break a lock if one is present from another instance.
98
99
        Uses the ui factory to ask for confirmation if the lock may be from
100
        an active process.
101
102
        This will probe the repository for its lock as well.
103
        """
104
        self.control_files.break_lock()
105
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
106
        master = self.get_master_branch()
107
        if master is not None:
108
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
109
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
110
    @staticmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
111
    @deprecated_method(zero_eight)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
112
    def open_downlevel(base):
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
113
        """Open a branch which may be of an old format."""
114
        return Branch.open(base, _unsupported=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
115
        
116
    @staticmethod
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
117
    def open(base, _unsupported=False):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
118
        """Open the repository rooted at base.
119
120
        For instance, if the repository is at URL/.bzr/repository,
121
        Repository.open(URL) -> a Repository instance.
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
122
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
123
        control = bzrdir.BzrDir.open(base, _unsupported)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
124
        return control.open_branch(_unsupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
125
126
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
127
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
128
        """Open an existing branch which contains url.
129
        
130
        This probes for a branch at url, and searches upwards from there.
1185.17.2 by Martin Pool
[pick] avoid problems in fetching when .bzr is not listable
131
132
        Basically we keep looking up until we find the control directory or
133
        run into the root.  If there isn't one, raises NotBranchError.
1534.4.22 by Robert Collins
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch.
134
        If there is one and it is either an unrecognised format or an unsupported 
135
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
136
        If there is one, it is returned, along with the unused portion of url.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
137
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
138
        control, relpath = bzrdir.BzrDir.open_containing(url)
139
        return control.open_branch(), relpath
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
140
141
    @staticmethod
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
142
    @deprecated_function(zero_eight)
143
    def initialize(base):
144
        """Create a new working tree and branch, rooted at 'base' (url)
1551.1.2 by Martin Pool
Deprecation warnings for popular APIs that will change in BzrDir
145
146
        NOTE: This will soon be deprecated in favour of creation
147
        through a BzrDir.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
148
        """
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
149
        return bzrdir.BzrDir.create_standalone_workingtree(base).branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
150
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
151
    def setup_caching(self, cache_root):
152
        """Subclasses that care about caching should override this, and set
153
        up cached stores located under cache_root.
154
        """
1185.70.6 by Martin Pool
review fixups from John
155
        # seems to be unused, 2006-01-13 mbp
156
        warn('%s is deprecated' % self.setup_caching)
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
157
        self.cache_root = cache_root
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
158
1185.35.11 by Aaron Bentley
Added support for branch nicks
159
    def _get_nick(self):
160
        cfg = self.tree_config()
1530.1.3 by Robert Collins
transport implementations now tested consistently.
161
        return cfg.get_option(u"nickname", default=self.base.split('/')[-2])
1185.35.11 by Aaron Bentley
Added support for branch nicks
162
163
    def _set_nick(self, nick):
164
        cfg = self.tree_config()
165
        cfg.set_option(nick, "nickname")
166
        assert cfg.get_option("nickname") == nick
167
168
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
169
170
    def is_locked(self):
171
        raise NotImplementedError('is_locked is abstract')
172
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
173
    def lock_write(self):
174
        raise NotImplementedError('lock_write is abstract')
1694.2.6 by Martin Pool
[merge] bzr.dev
175
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
176
    def lock_read(self):
177
        raise NotImplementedError('lock_read is abstract')
178
179
    def unlock(self):
180
        raise NotImplementedError('unlock is abstract')
181
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
182
    def peek_lock_mode(self):
183
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
184
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
185
1694.2.6 by Martin Pool
[merge] bzr.dev
186
    def get_physical_lock_status(self):
187
        raise NotImplementedError('get_physical_lock_status is abstract')
188
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
189
    def abspath(self, name):
190
        """Return absolute filename for something in the branch
191
        
192
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
193
        method and not a tree method.
194
        """
195
        raise NotImplementedError('abspath is abstract')
196
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
197
    def bind(self, other):
198
        """Bind the local branch the other branch.
199
200
        :param other: The branch to bind to
201
        :type other: Branch
202
        """
203
        raise errors.UpgradeRequired(self.base)
204
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
205
    @needs_write_lock
206
    def fetch(self, from_branch, last_revision=None, pb=None):
207
        """Copy revisions from from_branch into this branch.
208
209
        :param from_branch: Where to copy from.
210
        :param last_revision: What revision to stop at (None for at the end
211
                              of the branch.
212
        :param pb: An optional progress bar to use.
213
214
        Returns the copied revision count and the failed revisions in a tuple:
215
        (copied, failures).
216
        """
217
        if self.base == from_branch.base:
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
218
            return (0, [])
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
219
        if pb is None:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
220
            nested_pb = bzrlib.ui.ui_factory.nested_progress_bar()
221
            pb = nested_pb
222
        else:
223
            nested_pb = None
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
224
225
        from_branch.lock_read()
226
        try:
227
            if last_revision is None:
228
                pb.update('get source history')
229
                from_history = from_branch.revision_history()
230
                if from_history:
231
                    last_revision = from_history[-1]
232
                else:
233
                    # no history in the source branch
234
                    last_revision = NULL_REVISION
235
            return self.repository.fetch(from_branch.repository,
236
                                         revision_id=last_revision,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
237
                                         pb=nested_pb)
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
238
        finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
239
            if nested_pb is not None:
240
                nested_pb.finished()
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
241
            from_branch.unlock()
242
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
243
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
244
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
245
246
        Older format branches cannot bind, please be sure to use a metadir
247
        branch.
248
        """
249
        return None
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
250
    
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
251
    def get_commit_builder(self, parents, config=None, timestamp=None, 
252
                           timezone=None, committer=None, revprops=None, 
253
                           revision_id=None):
254
        """Obtain a CommitBuilder for this branch.
255
        
256
        :param parents: Revision ids of the parents of the new revision.
257
        :param config: Optional configuration to use.
258
        :param timestamp: Optional timestamp recorded for commit.
259
        :param timezone: Optional timezone for timestamp.
260
        :param committer: Optional committer to set for commit.
261
        :param revprops: Optional dictionary of revision properties.
262
        :param revision_id: Optional revision id.
263
        """
264
265
        if config is None:
266
            config = bzrlib.config.BranchConfig(self)
267
        
268
        return self.repository.get_commit_builder(self, parents, config, 
269
            timestamp, timezone, committer, revprops, revision_id)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
270
271
    def get_master_branch(self):
272
        """Return the branch we are bound to.
273
        
274
        :return: Either a Branch, or None
275
        """
276
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
277
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
278
    def get_revision_delta(self, revno):
279
        """Return the delta for one revision.
280
281
        The delta is relative to its mainline predecessor, or the
282
        empty tree for revision 1.
283
        """
284
        assert isinstance(revno, int)
285
        rh = self.revision_history()
286
        if not (1 <= revno <= len(rh)):
287
            raise InvalidRevisionNumber(revno)
288
        return self.repository.get_revision_delta(rh[revno-1])
289
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
290
    def get_root_id(self):
291
        """Return the id of this branches root"""
292
        raise NotImplementedError('get_root_id is abstract')
293
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
294
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
295
        """Print `file` to stdout."""
296
        raise NotImplementedError('print_file is abstract')
297
298
    def append_revision(self, *revision_ids):
299
        raise NotImplementedError('append_revision is abstract')
300
301
    def set_revision_history(self, rev_history):
302
        raise NotImplementedError('set_revision_history is abstract')
303
304
    def revision_history(self):
305
        """Return sequence of revision hashes on to this branch."""
306
        raise NotImplementedError('revision_history is abstract')
307
308
    def revno(self):
309
        """Return current revision number for this branch.
310
311
        That is equivalent to the number of revisions committed to
312
        this branch.
313
        """
314
        return len(self.revision_history())
315
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
316
    def unbind(self):
317
        """Older format branches cannot bind or unbind."""
318
        raise errors.UpgradeRequired(self.base)
319
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
320
    def last_revision(self):
321
        """Return last patch hash, or None if no history."""
322
        ph = self.revision_history()
323
        if ph:
324
            return ph[-1]
325
        else:
326
            return None
327
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
328
    def missing_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
329
        """Return a list of new revisions that would perfectly fit.
330
        
331
        If self and other have not diverged, return a list of the revisions
332
        present in other, but missing from self.
333
        """
334
        self_history = self.revision_history()
335
        self_len = len(self_history)
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
336
        other_history = other.revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
337
        other_len = len(other_history)
338
        common_index = min(self_len, other_len) -1
339
        if common_index >= 0 and \
340
            self_history[common_index] != other_history[common_index]:
341
            raise DivergedBranches(self, other)
342
343
        if stop_revision is None:
344
            stop_revision = other_len
345
        else:
346
            assert isinstance(stop_revision, int)
347
            if stop_revision > other_len:
348
                raise bzrlib.errors.NoSuchRevision(self, stop_revision)
349
        return other_history[self_len:stop_revision]
1185.66.1 by Aaron Bentley
Merged from mainline
350
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
351
    def update_revisions(self, other, stop_revision=None):
1505.1.16 by John Arbash Meinel
[merge] robertc's integration, updated tests to check for retcode=3
352
        """Pull in new perfect-fit revisions.
353
354
        :param other: Another Branch to pull from
355
        :param stop_revision: Updated until the given revision
356
        :return: None
357
        """
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
358
        raise NotImplementedError('update_revisions is abstract')
359
360
    def revision_id_to_revno(self, revision_id):
361
        """Given a revision id, return its revno"""
362
        if revision_id is None:
363
            return 0
364
        history = self.revision_history()
365
        try:
366
            return history.index(revision_id) + 1
367
        except ValueError:
368
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
369
370
    def get_rev_id(self, revno, history=None):
371
        """Find the revision id of the specified revno."""
372
        if revno == 0:
373
            return None
374
        if history is None:
375
            history = self.revision_history()
376
        elif revno <= 0 or revno > len(history):
377
            raise bzrlib.errors.NoSuchRevision(self, revno)
378
        return history[revno - 1]
379
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
380
    def pull(self, source, overwrite=False, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
381
        raise NotImplementedError('pull is abstract')
382
383
    def basis_tree(self):
384
        """Return `Tree` object for last revision.
385
386
        If there are no revisions yet, return an `EmptyTree`.
387
        """
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
388
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
389
390
    def rename_one(self, from_rel, to_rel):
391
        """Rename one file.
392
393
        This can change the directory or the filename or both.
394
        """
395
        raise NotImplementedError('rename_one is abstract')
396
397
    def move(self, from_paths, to_name):
398
        """Rename files.
399
400
        to_name must exist as a versioned directory.
401
402
        If to_name exists and is a directory, the files are moved into
403
        it, keeping their old names.  If it is a directory, 
404
405
        Note that to_name is only the last component of the new name;
406
        this doesn't change the directory.
407
408
        This returns a list of (from_path, to_path) pairs for each
409
        entry that is moved.
410
        """
411
        raise NotImplementedError('move is abstract')
412
413
    def get_parent(self):
414
        """Return the parent location of the branch.
415
416
        This is the default location for push/pull/missing.  The usual
417
        pattern is that the user can override it by specifying a
418
        location.
419
        """
420
        raise NotImplementedError('get_parent is abstract')
421
422
    def get_push_location(self):
423
        """Return the None or the location to push this branch to."""
424
        raise NotImplementedError('get_push_location is abstract')
425
426
    def set_push_location(self, location):
427
        """Set a new push location for this branch."""
428
        raise NotImplementedError('set_push_location is abstract')
429
430
    def set_parent(self, url):
431
        raise NotImplementedError('set_parent is abstract')
432
1587.1.10 by Robert Collins
update updates working tree and branch together.
433
    @needs_write_lock
434
    def update(self):
435
        """Synchronise this branch with the master branch if any. 
436
437
        :return: None or the last_revision pivoted out during the update.
438
        """
439
        return None
440
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
441
    def check_revno(self, revno):
442
        """\
443
        Check whether a revno corresponds to any revision.
444
        Zero (the NULL revision) is considered valid.
445
        """
446
        if revno != 0:
447
            self.check_real_revno(revno)
448
            
449
    def check_real_revno(self, revno):
450
        """\
451
        Check whether a revno corresponds to a real revision.
452
        Zero (the NULL revision) is considered invalid
453
        """
454
        if revno < 1 or revno > self.revno():
455
            raise InvalidRevisionNumber(revno)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
456
457
    @needs_read_lock
458
    def clone(self, *args, **kwargs):
459
        """Clone this branch into to_bzrdir preserving all semantic values.
460
        
461
        revision_id: if not None, the revision history in the new branch will
462
                     be truncated to end with revision_id.
463
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
464
        # for API compatibility, until 0.8 releases we provide the old api:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
465
        # def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
466
        # after 0.8 releases, the *args and **kwargs should be changed:
467
        # def clone(self, to_bzrdir, revision_id=None):
468
        if (kwargs.get('to_location', None) or
469
            kwargs.get('revision', None) or
470
            kwargs.get('basis_branch', None) or
471
            (len(args) and isinstance(args[0], basestring))):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
472
            # backwards compatibility api:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
473
            warn("Branch.clone() has been deprecated for BzrDir.clone() from"
474
                 " bzrlib 0.8.", DeprecationWarning, stacklevel=3)
475
            # get basis_branch
476
            if len(args) > 2:
477
                basis_branch = args[2]
478
            else:
479
                basis_branch = kwargs.get('basis_branch', None)
480
            if basis_branch:
481
                basis = basis_branch.bzrdir
482
            else:
483
                basis = None
484
            # get revision
485
            if len(args) > 1:
486
                revision_id = args[1]
487
            else:
488
                revision_id = kwargs.get('revision', None)
489
            # get location
490
            if len(args):
491
                url = args[0]
492
            else:
493
                # no default to raise if not provided.
494
                url = kwargs.get('to_location')
495
            return self.bzrdir.clone(url,
496
                                     revision_id=revision_id,
497
                                     basis=basis).open_branch()
498
        # new cleaner api.
499
        # generate args by hand 
500
        if len(args) > 1:
501
            revision_id = args[1]
502
        else:
503
            revision_id = kwargs.get('revision_id', None)
504
        if len(args):
505
            to_bzrdir = args[0]
506
        else:
507
            # no default to raise if not provided.
508
            to_bzrdir = kwargs.get('to_bzrdir')
509
        result = self._format.initialize(to_bzrdir)
510
        self.copy_content_into(result, revision_id=revision_id)
511
        return  result
512
513
    @needs_read_lock
514
    def sprout(self, to_bzrdir, revision_id=None):
515
        """Create a new line of development from the branch, into to_bzrdir.
516
        
517
        revision_id: if not None, the revision history in the new branch will
518
                     be truncated to end with revision_id.
519
        """
520
        result = self._format.initialize(to_bzrdir)
521
        self.copy_content_into(result, revision_id=revision_id)
522
        result.set_parent(self.bzrdir.root_transport.base)
523
        return result
524
525
    @needs_read_lock
526
    def copy_content_into(self, destination, revision_id=None):
527
        """Copy the content of self into destination.
528
529
        revision_id: if not None, the revision history in the new branch will
530
                     be truncated to end with revision_id.
531
        """
532
        new_history = self.revision_history()
533
        if revision_id is not None:
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
534
            try:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
535
                new_history = new_history[:new_history.index(revision_id) + 1]
536
            except ValueError:
537
                rev = self.repository.get_revision(revision_id)
538
                new_history = rev.get_history(self.repository)[1:]
539
        destination.set_revision_history(new_history)
540
        parent = self.get_parent()
541
        if parent:
542
            destination.set_parent(parent)
1185.66.1 by Aaron Bentley
Merged from mainline
543
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
544
    @needs_read_lock
545
    def check(self):
546
        """Check consistency of the branch.
547
548
        In particular this checks that revisions given in the revision-history
549
        do actually match up in the revision graph, and that they're all 
550
        present in the repository.
551
552
        :return: A BranchCheckResult.
553
        """
554
        mainline_parent_id = None
555
        for revision_id in self.revision_history():
556
            try:
557
                revision = self.repository.get_revision(revision_id)
558
            except errors.NoSuchRevision, e:
559
                raise BzrCheckError("mainline revision {%s} not in repository"
560
                        % revision_id)
561
            # In general the first entry on the revision history has no parents.
562
            # But it's not illegal for it to have parents listed; this can happen
563
            # in imports from Arch when the parents weren't reachable.
564
            if mainline_parent_id is not None:
565
                if mainline_parent_id not in revision.parent_ids:
566
                    raise BzrCheckError("previous revision {%s} not listed among "
567
                                        "parents of {%s}"
568
                                        % (mainline_parent_id, revision_id))
569
            mainline_parent_id = revision_id
570
        return BranchCheckResult(self)
571
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
572
573
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
574
    """An encapsulation of the initialization and open routines for a format.
575
576
    Formats provide three things:
577
     * An initialization routine,
578
     * a format string,
579
     * an open routine.
580
581
    Formats are placed in an dict by their format string for reference 
582
    during branch opening. Its not required that these be instances, they
583
    can be classes themselves with class methods - it simply depends on 
584
    whether state is needed for a given format or not.
585
586
    Once a format is deprecated, just deprecate the initialize and open
587
    methods on the format class. Do not deprecate the object, as the 
588
    object will be created every time regardless.
589
    """
590
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
591
    _default_format = None
592
    """The default format used for new branches."""
593
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
594
    _formats = {}
595
    """The known formats."""
596
597
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
598
    def find_format(klass, a_bzrdir):
599
        """Return the format for the branch object in a_bzrdir."""
600
        try:
601
            transport = a_bzrdir.get_branch_transport(None)
602
            format_string = transport.get("format").read()
603
            return klass._formats[format_string]
604
        except NoSuchFile:
605
            raise NotBranchError(path=transport.base)
606
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
607
            raise errors.UnknownFormatError(format=format_string)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
608
609
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
610
    def get_default_format(klass):
611
        """Return the current default format."""
612
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
613
614
    def get_format_string(self):
615
        """Return the ASCII format string that identifies this format."""
616
        raise NotImplementedError(self.get_format_string)
617
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
618
    def get_format_description(self):
619
        """Return the short format description for this format."""
620
        raise NotImplementedError(self.get_format_string)
621
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
622
    def initialize(self, a_bzrdir):
623
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
624
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
625
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
626
    def is_supported(self):
627
        """Is this format supported?
628
629
        Supported formats can be initialized and opened.
630
        Unsupported formats may not support initialization or committing or 
631
        some other features depending on the reason for not being supported.
632
        """
633
        return True
634
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
635
    def open(self, a_bzrdir, _found=False):
636
        """Return the branch object for a_bzrdir
637
638
        _found is a private parameter, do not use it. It is used to indicate
639
               if format probing has already be done.
640
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
641
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
642
643
    @classmethod
644
    def register_format(klass, format):
645
        klass._formats[format.get_format_string()] = format
646
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
647
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
648
    def set_default_format(klass, format):
649
        klass._default_format = format
650
651
    @classmethod
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
652
    def unregister_format(klass, format):
653
        assert klass._formats[format.get_format_string()] is format
654
        del klass._formats[format.get_format_string()]
655
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
656
    def __str__(self):
657
        return self.get_format_string().rstrip()
658
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
659
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
660
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
661
    """Bzr branch format 4.
662
663
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
664
     - a revision-history file.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
665
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
666
    """
667
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
668
    def get_format_description(self):
669
        """See BranchFormat.get_format_description()."""
670
        return "Branch format 4"
671
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
672
    def initialize(self, a_bzrdir):
673
        """Create a branch of this format in a_bzrdir."""
674
        mutter('creating branch in %s', a_bzrdir.transport.base)
675
        branch_transport = a_bzrdir.get_branch_transport(self)
676
        utf8_files = [('revision-history', ''),
677
                      ('branch-name', ''),
678
                      ]
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
679
        control_files = LockableFiles(branch_transport, 'branch-lock',
680
                                      TransportLock)
681
        control_files.create_lock()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
682
        control_files.lock_write()
683
        try:
684
            for file, content in utf8_files:
685
                control_files.put_utf8(file, content)
686
        finally:
687
            control_files.unlock()
688
        return self.open(a_bzrdir, _found=True)
689
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
690
    def __init__(self):
691
        super(BzrBranchFormat4, self).__init__()
692
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
693
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
694
    def open(self, a_bzrdir, _found=False):
695
        """Return the branch object for a_bzrdir
696
697
        _found is a private parameter, do not use it. It is used to indicate
698
               if format probing has already be done.
699
        """
700
        if not _found:
701
            # we are being called directly and must probe.
702
            raise NotImplementedError
703
        return BzrBranch(_format=self,
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
704
                         _control_files=a_bzrdir._control_files,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
705
                         a_bzrdir=a_bzrdir,
706
                         _repository=a_bzrdir.open_repository())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
707
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
708
    def __str__(self):
709
        return "Bazaar-NG branch format 4"
710
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
711
712
class BzrBranchFormat5(BranchFormat):
713
    """Bzr branch format 5.
714
715
    This format has:
716
     - a revision-history file.
717
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
718
     - a lock dir guarding the branch itself
719
     - all of this stored in a branch/ subdirectory
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
720
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
721
722
    This format is new in bzr 0.8.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
723
    """
724
725
    def get_format_string(self):
726
        """See BranchFormat.get_format_string()."""
727
        return "Bazaar-NG branch format 5\n"
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
728
729
    def get_format_description(self):
730
        """See BranchFormat.get_format_description()."""
731
        return "Branch format 5"
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
732
        
733
    def initialize(self, a_bzrdir):
734
        """Create a branch of this format in a_bzrdir."""
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
735
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
736
        branch_transport = a_bzrdir.get_branch_transport(self)
737
        utf8_files = [('revision-history', ''),
738
                      ('branch-name', ''),
739
                      ]
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
740
        control_files = LockableFiles(branch_transport, 'lock', LockDir)
1553.5.63 by Martin Pool
Lock type is now mandatory for LockableFiles constructor
741
        control_files.create_lock()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
742
        control_files.lock_write()
743
        control_files.put_utf8('format', self.get_format_string())
744
        try:
745
            for file, content in utf8_files:
746
                control_files.put_utf8(file, content)
747
        finally:
748
            control_files.unlock()
749
        return self.open(a_bzrdir, _found=True, )
750
751
    def __init__(self):
752
        super(BzrBranchFormat5, self).__init__()
753
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
754
755
    def open(self, a_bzrdir, _found=False):
756
        """Return the branch object for a_bzrdir
757
758
        _found is a private parameter, do not use it. It is used to indicate
759
               if format probing has already be done.
760
        """
761
        if not _found:
762
            format = BranchFormat.find_format(a_bzrdir)
763
            assert format.__class__ == self.__class__
764
        transport = a_bzrdir.get_branch_transport(None)
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
765
        control_files = LockableFiles(transport, 'lock', LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
766
        return BzrBranch5(_format=self,
767
                          _control_files=control_files,
768
                          a_bzrdir=a_bzrdir,
769
                          _repository=a_bzrdir.find_repository())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
770
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
771
    def __str__(self):
772
        return "Bazaar-NG Metadir branch format 5"
773
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
774
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
775
class BranchReferenceFormat(BranchFormat):
776
    """Bzr branch reference format.
777
778
    Branch references are used in implementing checkouts, they
779
    act as an alias to the real branch which is at some other url.
780
781
    This format has:
782
     - A location file
783
     - a format string
784
    """
785
786
    def get_format_string(self):
787
        """See BranchFormat.get_format_string()."""
788
        return "Bazaar-NG Branch Reference Format 1\n"
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
789
790
    def get_format_description(self):
791
        """See BranchFormat.get_format_description()."""
792
        return "Checkout reference format 1"
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
793
        
794
    def initialize(self, a_bzrdir, target_branch=None):
795
        """Create a branch of this format in a_bzrdir."""
796
        if target_branch is None:
797
            # this format does not implement branch itself, thus the implicit
798
            # creation contract must see it as uninitializable
799
            raise errors.UninitializableFormat(self)
800
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
801
        branch_transport = a_bzrdir.get_branch_transport(self)
802
        # FIXME rbc 20060209 one j-a-ms encoding branch lands this str() cast is not needed.
803
        branch_transport.put('location', StringIO(str(target_branch.bzrdir.root_transport.base)))
804
        branch_transport.put('format', StringIO(self.get_format_string()))
805
        return self.open(a_bzrdir, _found=True)
806
807
    def __init__(self):
808
        super(BranchReferenceFormat, self).__init__()
809
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
810
811
    def _make_reference_clone_function(format, a_branch):
812
        """Create a clone() routine for a branch dynamically."""
813
        def clone(to_bzrdir, revision_id=None):
814
            """See Branch.clone()."""
815
            return format.initialize(to_bzrdir, a_branch)
816
            # cannot obey revision_id limits when cloning a reference ...
817
            # FIXME RBC 20060210 either nuke revision_id for clone, or
818
            # emit some sort of warning/error to the caller ?!
819
        return clone
820
821
    def open(self, a_bzrdir, _found=False):
822
        """Return the branch that the branch reference in a_bzrdir points at.
823
824
        _found is a private parameter, do not use it. It is used to indicate
825
               if format probing has already be done.
826
        """
827
        if not _found:
828
            format = BranchFormat.find_format(a_bzrdir)
829
            assert format.__class__ == self.__class__
830
        transport = a_bzrdir.get_branch_transport(None)
831
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
832
        result = real_bzrdir.open_branch()
833
        # this changes the behaviour of result.clone to create a new reference
834
        # rather than a copy of the content of the branch.
835
        # I did not use a proxy object because that needs much more extensive
836
        # testing, and we are only changing one behaviour at the moment.
837
        # If we decide to alter more behaviours - i.e. the implicit nickname
838
        # then this should be refactored to introduce a tested proxy branch
839
        # and a subclass of that for use in overriding clone() and ....
840
        # - RBC 20060210
841
        result.clone = self._make_reference_clone_function(result)
842
        return result
843
844
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
845
# formats which have no format string are not discoverable
846
# and not independently creatable, so are not registered.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
847
__default_format = BzrBranchFormat5()
848
BranchFormat.register_format(__default_format)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
849
BranchFormat.register_format(BranchReferenceFormat())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
850
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
851
_legacy_formats = [BzrBranchFormat4(),
852
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
853
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
854
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
855
    """A branch stored in the actual filesystem.
856
857
    Note that it's "local" in the context of the filesystem; it doesn't
858
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
859
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
860
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
861
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
862
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
863
                 relax_version_check=DEPRECATED_PARAMETER, _format=None,
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
864
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
865
        """Create new branch object at a particular location.
866
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
867
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
868
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
869
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
870
             unversioned directory.  If False, the branch must already
871
             be versioned.
872
1293 by Martin Pool
- add Branch constructor option to relax version check
873
        relax_version_check -- If true, the usual check for the branch
874
            version is not applied.  This is intended only for
875
            upgrade/recovery type use; it's not guaranteed that
876
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
877
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
878
        if a_bzrdir is None:
879
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
880
        else:
881
            self.bzrdir = a_bzrdir
882
        self._transport = self.bzrdir.transport.clone('..')
1534.4.28 by Robert Collins
first cut at merge from integration.
883
        self._base = self._transport.base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
884
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
885
        if _control_files is None:
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
886
            raise BzrBadParameterMissing('_control_files')
1534.4.28 by Robert Collins
first cut at merge from integration.
887
        self.control_files = _control_files
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
888
        if deprecated_passed(init):
889
            warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
890
                 "deprecated as of bzr 0.8. Please use Branch.create().",
891
                 DeprecationWarning,
892
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
893
            if init:
894
                # this is slower than before deprecation, oh well never mind.
895
                # -> its deprecated.
896
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
897
        self._check_format(_format)
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
898
        if deprecated_passed(relax_version_check):
899
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
900
                 "relax_version_check parameter is deprecated as of bzr 0.8. "
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
901
                 "Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
902
                 "open() method.",
903
                 DeprecationWarning,
904
                 stacklevel=2)
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
905
            if (not relax_version_check
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
906
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
907
                raise errors.UnsupportedFormatError(format=fmt)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
908
        if deprecated_passed(transport):
909
            warn("BzrBranch.__init__(transport=XXX...): The transport "
910
                 "parameter is deprecated as of bzr 0.8. "
911
                 "Please use Branch.open, or bzrdir.open_branch().",
912
                 DeprecationWarning,
913
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
914
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
915
1 by mbp at sourcefrog
import from baz patch-364
916
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
917
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
918
919
    __repr__ = __str__
920
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
921
    def __del__(self):
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
922
        # TODO: It might be best to do this somewhere else,
923
        # but it is nice for a Branch object to automatically
924
        # cache it's information.
925
        # Alternatively, we could have the Transport objects cache requests
926
        # See the earlier discussion about how major objects (like Branch)
927
        # should never expect their __del__ function to run.
1185.70.6 by Martin Pool
review fixups from John
928
        # XXX: cache_root seems to be unused, 2006-01-13 mbp
1185.11.9 by John Arbash Meinel
Most tests pass, some problems with unavailable socket recv
929
        if hasattr(self, 'cache_root') and self.cache_root is not None:
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
930
            try:
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
931
                rmtree(self.cache_root)
907.1.23 by John Arbash Meinel
Branch objects now automatically create Cached stores if the protocol is_remote.
932
            except:
933
                pass
934
            self.cache_root = None
935
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
936
    def _get_base(self):
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
937
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
938
1442.1.5 by Robert Collins
Give branch.base a docstring.
939
    base = property(_get_base, doc="The URL for the root of this branch.")
578 by Martin Pool
- start to move toward Branch.lock and unlock methods,
940
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
941
    def _finish_transaction(self):
942
        """Exit the current transaction."""
1185.65.13 by Robert Collins
Merge from integration
943
        return self.control_files._finish_transaction()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
944
945
    def get_transaction(self):
1185.65.13 by Robert Collins
Merge from integration
946
        """Return the current active transaction.
947
948
        If no transaction is active, this returns a passthrough object
949
        for which all data is immediately flushed and no caching happens.
950
        """
951
        # this is an explicit function so that we can do tricky stuff
952
        # when the storage in rev_storage is elsewhere.
953
        # we probably need to hook the two 'lock a location' and 
954
        # 'have a transaction' together more delicately, so that
955
        # we can have two locks (branch and storage) and one transaction
956
        # ... and finishing the transaction unlocks both, but unlocking
957
        # does not. - RBC 20051121
958
        return self.control_files.get_transaction()
959
960
    def _set_transaction(self, transaction):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
961
        """Set a new active transaction."""
1185.65.13 by Robert Collins
Merge from integration
962
        return self.control_files._set_transaction(transaction)
353 by Martin Pool
- Per-branch locks in read and write modes.
963
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
964
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
965
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
966
        return self.control_files._transport.abspath(name)
1185.58.4 by John Arbash Meinel
Added permission checking to Branch, and propogated that change into the stores.
967
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
968
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
969
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
970
1534.4.8 by Robert Collins
Unfuck upgrade.
971
        The format is stored as a reference to the format object in
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
972
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
973
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
974
        The format parameter is either None or the branch format class
975
        used to open this branch.
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
976
977
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
978
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
979
        if format is None:
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
980
            format = BzrBranchFormat.find_format(self.bzrdir)
981
        self._format = format
982
        mutter("got branch format %s", self._format)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
983
1508.1.15 by Robert Collins
Merge from mpool.
984
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
985
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
986
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
987
        tree = self.repository.revision_tree(self.last_revision())
988
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
989
1694.2.6 by Martin Pool
[merge] bzr.dev
990
    def is_locked(self):
991
        return self.control_files.is_locked()
992
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
993
    def lock_write(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
994
        # TODO: test for failed two phase locks. This is known broken.
995
        self.control_files.lock_write()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
996
        self.repository.lock_write()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
997
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
998
    def lock_read(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
999
        # TODO: test for failed two phase locks. This is known broken.
1000
        self.control_files.lock_read()
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1001
        self.repository.lock_read()
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1002
1003
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1004
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1005
        try:
1006
            self.repository.unlock()
1007
        finally:
1008
            self.control_files.unlock()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1009
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1010
    def peek_lock_mode(self):
1011
        if self.control_files._lock_count == 0:
1012
            return None
1013
        else:
1014
            return self.control_files._lock_mode
1015
1694.2.6 by Martin Pool
[merge] bzr.dev
1016
    def get_physical_lock_status(self):
1017
        return self.control_files.get_physical_lock_status()
1018
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1019
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1020
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1021
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1022
        return self.repository.print_file(file, revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1023
1024
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1025
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1026
        """See Branch.append_revision."""
905 by Martin Pool
- merge aaron's append_multiple.patch
1027
        for revision_id in revision_ids:
1028
            mutter("add {%s} to revision-history" % revision_id)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1029
        rev_history = self.revision_history()
1030
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1031
        self.set_revision_history(rev_history)
1032
1033
    @needs_write_lock
1034
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1035
        """See Branch.set_revision_history."""
1185.65.12 by Robert Collins
Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.
1036
        self.control_files.put_utf8(
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1037
            'revision-history', '\n'.join(rev_history))
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1038
        transaction = self.get_transaction()
1039
        history = transaction.map.find_revision_history()
1040
        if history is not None:
1041
            # update the revision history in the identity map.
1042
            history[:] = list(rev_history)
1043
            # this call is disabled because revision_history is 
1044
            # not really an object yet, and the transaction is for objects.
1045
            # transaction.register_dirty(history)
1046
        else:
1047
            transaction.map.add_revision_history(rev_history)
1048
            # this call is disabled because revision_history is 
1049
            # not really an object yet, and the transaction is for objects.
1050
            # transaction.register_clean(history)
233 by mbp at sourcefrog
- more output from test.sh
1051
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1052
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
1053
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1054
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1055
        transaction = self.get_transaction()
1056
        history = transaction.map.find_revision_history()
1057
        if history is not None:
1058
            mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
1059
            return list(history)
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1060
        history = [l.rstrip('\r\n') for l in
1185.65.29 by Robert Collins
Implement final review suggestions.
1061
                self.control_files.get_utf8('revision-history').readlines()]
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1062
        transaction.map.add_revision_history(history)
1063
        # this call is disabled because revision_history is 
1064
        # not really an object yet, and the transaction is for objects.
1065
        # transaction.register_clean(history, precious=True)
1066
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
1067
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1068
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1069
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1070
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1071
        other.lock_read()
1072
        try:
1073
            if stop_revision is None:
1074
                stop_revision = other.last_revision()
1075
                if stop_revision is None:
1076
                    # if there are no commits, we're done.
1077
                    return
1078
            # whats the current last revision, before we fetch [and change it
1079
            # possibly]
1080
            last_rev = self.last_revision()
1081
            # we fetch here regardless of whether we need to so that we pickup
1082
            # filled in ghosts.
1083
            self.fetch(other, stop_revision)
1084
            my_ancestry = self.repository.get_ancestry(last_rev)
1085
            if stop_revision in my_ancestry:
1086
                # last_revision is a descendant of stop_revision
1087
                return
1088
            # stop_revision must be a descendant of last_revision
1089
            stop_graph = self.repository.get_revision_graph(stop_revision)
1090
            if last_rev is not None and last_rev not in stop_graph:
1091
                # our previous tip is not merged into stop_revision
1092
                raise errors.DivergedBranches(self, other)
1093
            # make a new revision history from the graph
1094
            current_rev_id = stop_revision
1095
            new_history = []
1096
            while current_rev_id not in (None, NULL_REVISION):
1097
                new_history.append(current_rev_id)
1098
                current_rev_id_parents = stop_graph[current_rev_id]
1099
                try:
1100
                    current_rev_id = current_rev_id_parents[0]
1101
                except IndexError:
1102
                    current_rev_id = None
1103
            new_history.reverse()
1104
            self.set_revision_history(new_history)
1105
        finally:
1106
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1107
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1108
    def basis_tree(self):
1109
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1110
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1111
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1112
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1113
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1114
        """Create a Working tree object for this branch."""
1185.2.2 by Lalo Martins
cleaning up and refactoring the branch module.
1115
        from bzrlib.workingtree import WorkingTree
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1116
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1117
        if (self.base.find('://') != -1 or 
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1118
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1119
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1120
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1121
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1122
    @needs_write_lock
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
1123
    def pull(self, source, overwrite=False, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1124
        """See Branch.pull."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1125
        source.lock_read()
1126
        try:
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1127
            old_count = len(self.revision_history())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1128
            try:
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
1129
                self.update_revisions(source,stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1130
            except DivergedBranches:
1131
                if not overwrite:
1132
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1133
            if overwrite:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1134
                self.set_revision_history(source.revision_history())
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
1135
            new_count = len(self.revision_history())
1136
            return new_count - old_count
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1137
        finally:
1138
            source.unlock()
1 by mbp at sourcefrog
import from baz patch-364
1139
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1140
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1141
        """See Branch.get_parent."""
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1142
        import errno
1143
        _locs = ['parent', 'pull', 'x-pull']
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1144
        assert self.base[-1] == '/'
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1145
        for l in _locs:
1146
            try:
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1147
                parent = self.control_files.get(l).read().strip('\n')
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
1148
            except NoSuchFile:
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1149
                continue
1150
            # This is an old-format absolute path to a local branch
1151
            # turn it into a url
1152
            if parent.startswith('/'):
1711.2.48 by John Arbash Meinel
fix a typo in bzrlib/branch
1153
                parent = urlutils.local_path_to_url(parent.decode('utf8'))
1711.2.46 by John Arbash Meinel
Allow backwards compatibility with absolute local paths in parent
1154
            return urlutils.join(self.base[:-1], parent)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1155
        return None
1156
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1157
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1158
        """See Branch.get_push_location."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1159
        config = bzrlib.config.BranchConfig(self)
1160
        push_loc = config.get_user_option('push_location')
1161
        return push_loc
1162
1163
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1164
        """See Branch.set_push_location."""
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1165
        config = bzrlib.config.LocationConfig(self.base)
1166
        config.set_user_option('push_location', location)
1167
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1168
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1169
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1170
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1171
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1172
        # URLs should never be unicode, even on the local fs,
1173
        # FIXUP this and get_parent in a future branch format bump:
1174
        # read and rewrite the file, and have the new format code read
1175
        # using .get not .get_utf8. RBC 20060125
1614.2.5 by Olaf Conradi
Added testcase for bzr merge --remember.
1176
        if url is None:
1177
            self.control_files._transport.delete('parent')
1178
        else:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1179
            if isinstance(url, unicode):
1180
                try: 
1181
                    url = url.encode('ascii')
1182
                except UnicodeEncodeError:
1183
                    raise bzrlib.errors.InvalidURL(url,
1184
                        "Urls must be 7-bit ascii, "
1185
                        "use bzrlib.urlutils.escape")
1186
                    
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1187
            url = urlutils.relative_url(self.base, url)
1188
            self.control_files.put('parent', url + '\n')
1150 by Martin Pool
- add new Branch.set_parent and tests
1189
1185.35.11 by Aaron Bentley
Added support for branch nicks
1190
    def tree_config(self):
1191
        return TreeConfig(self)
1192
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1193
1194
class BzrBranch5(BzrBranch):
1195
    """A format 5 branch. This supports new features over plan branches.
1196
1197
    It has support for a master_branch which is the data for bound branches.
1198
    """
1199
1200
    def __init__(self,
1201
                 _format,
1202
                 _control_files,
1203
                 a_bzrdir,
1204
                 _repository):
1205
        super(BzrBranch5, self).__init__(_format=_format,
1206
                                         _control_files=_control_files,
1207
                                         a_bzrdir=a_bzrdir,
1208
                                         _repository=_repository)
1209
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1210
    @needs_write_lock
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1211
    def pull(self, source, overwrite=False, stop_revision=None):
1212
        """Updates branch.pull to be bound branch aware."""
1213
        bound_location = self.get_bound_location()
1214
        if source.base != bound_location:
1215
            # not pulling from master, so we need to update master.
1216
            master_branch = self.get_master_branch()
1217
            if master_branch:
1218
                master_branch.pull(source)
1219
                source = master_branch
1220
        return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1221
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1222
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1223
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1224
            return self.control_files.get_utf8('bound').read()[:-1]
1225
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1226
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1227
1228
    @needs_read_lock
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1229
    def get_master_branch(self):
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1230
        """Return the branch we are bound to.
1231
        
1232
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1233
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1234
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1235
        it must be revalidated on each new lock.
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1236
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1237
        # RBC 20060304 review this decision.
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1238
        """
1239
        bound_loc = self.get_bound_location()
1240
        if not bound_loc:
1241
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1242
        try:
1243
            return Branch.open(bound_loc)
1244
        except (errors.NotBranchError, errors.ConnectionError), e:
1245
            raise errors.BoundBranchConnectionFailure(
1246
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1247
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1248
    @needs_write_lock
1249
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1250
        """Set the target where this branch is bound to.
1251
1252
        :param location: URL to the target branch
1253
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1254
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1255
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1256
        else:
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1257
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1258
                self.control_files._transport.delete('bound')
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1259
            except NoSuchFile:
1260
                return False
1261
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1262
1263
    @needs_write_lock
1264
    def bind(self, other):
1265
        """Bind the local branch the other branch.
1266
1267
        :param other: The branch to bind to
1268
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1269
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1270
        # TODO: jam 20051230 Consider checking if the target is bound
1271
        #       It is debatable whether you should be able to bind to
1272
        #       a branch which is itself bound.
1273
        #       Committing is obviously forbidden,
1274
        #       but binding itself may not be.
1275
        #       Since we *have* to check at commit time, we don't
1276
        #       *need* to check here
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1277
        self.pull(other)
1278
1279
        # we are now equal to or a suffix of other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1280
1281
        # Since we have 'pulled' from the remote location,
1282
        # now we should try to pull in the opposite direction
1283
        # in case the local tree has more revisions than the
1284
        # remote one.
1285
        # There may be a different check you could do here
1286
        # rather than actually trying to install revisions remotely.
1287
        # TODO: capture an exception which indicates the remote branch
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1288
        #       is not writable. 
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1289
        #       If it is up-to-date, this probably should not be a failure
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1290
        
1291
        # lock other for write so the revision-history syncing cannot race
1292
        other.lock_write()
1293
        try:
1294
            other.pull(self)
1295
            # if this does not error, other now has the same last rev we do
1296
            # it can only error if the pull from other was concurrent with
1297
            # a commit to other from someone else.
1298
1299
            # until we ditch revision-history, we need to sync them up:
1300
            self.set_revision_history(other.revision_history())
1301
            # now other and self are up to date with each other and have the
1302
            # same revision-history.
1303
        finally:
1304
            other.unlock()
1305
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1306
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1307
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1308
    @needs_write_lock
1309
    def unbind(self):
1310
        """If bound, unbind"""
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1311
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1312
1587.1.10 by Robert Collins
update updates working tree and branch together.
1313
    @needs_write_lock
1314
    def update(self):
1315
        """Synchronise this branch with the master branch if any. 
1316
1317
        :return: None or the last_revision that was pivoted out during the
1318
                 update.
1319
        """
1320
        master = self.get_master_branch()
1321
        if master is not None:
1322
            old_tip = self.last_revision()
1323
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1324
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1325
                return None
1326
            return old_tip
1327
        return None
1328
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1329
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1330
class BranchTestProviderAdapter(object):
1331
    """A tool to generate a suite testing multiple branch formats at once.
1332
1333
    This is done by copying the test once for each transport and injecting
1334
    the transport_server, transport_readonly_server, and branch_format
1335
    classes into each copy. Each copy is also given a new id() to make it
1336
    easy to identify.
1337
    """
1338
1339
    def __init__(self, transport_server, transport_readonly_server, formats):
1340
        self._transport_server = transport_server
1341
        self._transport_readonly_server = transport_readonly_server
1342
        self._formats = formats
1343
    
1344
    def adapt(self, test):
1345
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1346
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1347
            new_test = deepcopy(test)
1348
            new_test.transport_server = self._transport_server
1349
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1350
            new_test.bzrdir_format = bzrdir_format
1351
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1352
            def make_new_test_id():
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1353
                new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
1354
                return lambda: new_id
1355
            new_test.id = make_new_test_id()
1356
            result.addTest(new_test)
1357
        return result
1358
1359
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
1360
class BranchCheckResult(object):
1361
    """Results of checking branch consistency.
1362
1363
    :see: Branch.check
1364
    """
1365
1366
    def __init__(self, branch):
1367
        self.branch = branch
1368
1369
    def report_results(self, verbose):
1370
        """Report the check results via trace.note.
1371
        
1372
        :param verbose: Requests more detailed display of what was checked,
1373
            if any.
1374
        """
1375
        note('checked branch %s format %s',
1376
             self.branch.base,
1377
             self.branch._format)
1378
1379
1 by mbp at sourcefrog
import from baz patch-364
1380
######################################################################
1381
# predicates
1382
1383
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1384
@deprecated_function(zero_eight)
1385
def ScratchBranch(*args, **kwargs):
1386
    """See bzrlib.bzrdir.ScratchDir."""
1387
    d = ScratchDir(*args, **kwargs)
1388
    return d.open_branch()
1389
1390
1391
@deprecated_function(zero_eight)
1392
def is_control_file(*args, **kwargs):
1393
    """See bzrlib.workingtree.is_control_file."""
1394
    return bzrlib.workingtree.is_control_file(*args, **kwargs)