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