/brz/remove-bazaar

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