/brz/remove-bazaar

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