/brz/remove-bazaar

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