/brz/remove-bazaar

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