/brz/remove-bazaar

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