/brz/remove-bazaar

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