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