/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.3 by Martin Pool
Add tag: revision namespace.
1
# Copyright (C) 2005, 2006, 2007 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
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
18
from cStringIO import StringIO
19
20
from bzrlib.lazy_import import lazy_import
21
lazy_import(globals(), """
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
22
from copy import deepcopy
23
from unittest import TestSuite
1372 by Martin Pool
- avoid converting inventories to/from StringIO
24
from warnings import warn
1553.5.70 by Martin Pool
doc
25
1 by mbp at sourcefrog
import from baz patch-364
26
import bzrlib
1551.8.4 by Aaron Bentley
Tweak import style
27
from bzrlib import (
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
28
        bzrdir,
29
        cache_utf8,
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
30
        config as _mod_config,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
31
        errors,
32
        lockdir,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
33
        lockable_files,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
34
        osutils,
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
35
        revision as _mod_revision,
1911.2.9 by John Arbash Meinel
Fix accidental import removal
36
        transport,
1551.8.4 by Aaron Bentley
Tweak import style
37
        tree,
38
        ui,
1911.2.7 by John Arbash Meinel
[merge] bzr.dev 1924
39
        urlutils,
1551.8.4 by Aaron Bentley
Tweak import style
40
        )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
43
from bzrlib.tag import (
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
44
    BasicTags,
45
    DisabledTags,
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
46
    )
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
47
""")
48
1534.4.28 by Robert Collins
first cut at merge from integration.
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
50
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
51
                           HistoryMissing, InvalidRevisionId,
52
                           InvalidRevisionNumber, LockError, NoSuchFile,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
53
                           NoSuchRevision, NoWorkingTree, NotVersionedError,
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
54
                           NotBranchError, UninitializableFormat,
55
                           UnlistableStore, UnlistableBranch,
1767.3.1 by Jelmer Vernooij
Fix missing import of BzrCheckError.
56
                           )
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
57
from bzrlib.symbol_versioning import (deprecated_function,
58
                                      deprecated_method,
59
                                      DEPRECATED_PARAMETER,
60
                                      deprecated_passed,
1770.2.12 by Aaron Bentley
Merge bzr.dev
61
                                      zero_eight, zero_nine,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
62
                                      )
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
63
from bzrlib.trace import mutter, note
1104 by Martin Pool
- Add a simple UIFactory
64
1094 by Martin Pool
- merge aaron's merge improvements 999..1008
65
1186 by Martin Pool
- start implementing v5 format; Branch refuses to operate on old branches
66
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
67
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
1429 by Robert Collins
merge in niemeyers prefixed-store patch
68
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
69
70
71
# TODO: Maybe include checks for common corruption of newlines, etc?
1 by mbp at sourcefrog
import from baz patch-364
72
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
73
# TODO: Some operations like log might retrieve the same revisions
74
# repeatedly to calculate deltas.  We could perhaps have a weakref
1223 by Martin Pool
- store inventories in weave
75
# cache in memory to make this faster.  In general anything can be
1185.65.29 by Robert Collins
Implement final review suggestions.
76
# cached in memory between lock and unlock operations. .. nb thats
77
# what the transaction identity map provides
416 by Martin Pool
- bzr log and bzr root now accept an http URL
78
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
79
1 by mbp at sourcefrog
import from baz patch-364
80
######################################################################
81
# branch objects
82
558 by Martin Pool
- All top-level classes inherit from object
83
class Branch(object):
1 by mbp at sourcefrog
import from baz patch-364
84
    """Branch holding a history of revisions.
85
343 by Martin Pool
doc
86
    base
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
87
        Base directory/url of the branch.
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
88
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
89
    hooks: An instance of BranchHooks.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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
2220.2.10 by Martin Pool
(broken) start moving things to branches
95
    # override this to set the strategy for storing tags
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
96
    def _make_tags(self):
97
        return DisabledTags(self)
2220.2.10 by Martin Pool
(broken) start moving things to branches
98
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
99
    def __init__(self, *ignored, **ignored_too):
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
100
        self.tags = self._make_tags()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
101
1687.1.8 by Robert Collins
Teach Branch about break_lock.
102
    def break_lock(self):
103
        """Break a lock if one is present from another instance.
104
105
        Uses the ui factory to ask for confirmation if the lock may be from
106
        an active process.
107
108
        This will probe the repository for its lock as well.
109
        """
110
        self.control_files.break_lock()
111
        self.repository.break_lock()
1687.1.10 by Robert Collins
Branch.break_lock should handle bound branches too
112
        master = self.get_master_branch()
113
        if master is not None:
114
            master.break_lock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
115
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
116
    @staticmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
117
    @deprecated_method(zero_eight)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
118
    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.
119
        """Open a branch which may be of an old format."""
120
        return Branch.open(base, _unsupported=True)
1393.1.2 by Martin Pool
- better representation in Branch factories of opening old formats
121
        
122
    @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.
123
    def open(base, _unsupported=False):
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
124
        """Open the branch rooted at base.
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
125
1815.1.1 by Jelmer Vernooij
Fix copy-pasted comment.
126
        For instance, if the branch is at URL/.bzr/branch,
127
        Branch.open(URL) -> a Branch 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.
128
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
129
        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.
130
        return control.open_branch(_unsupported)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
131
132
    @staticmethod
1185.2.8 by Lalo Martins
creating the new branch constructors
133
    def open_containing(url):
1185.1.41 by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid
134
        """Open an existing branch which contains url.
135
        
136
        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
137
138
        Basically we keep looking up until we find the control directory or
139
        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.
140
        If there is one and it is either an unrecognised format or an unsupported 
141
        format, UnknownFormatError or UnsupportedFormatError are raised.
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
142
        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.
143
        """
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
144
        control, relpath = bzrdir.BzrDir.open_containing(url)
145
        return control.open_branch(), relpath
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
146
147
    @staticmethod
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
148
    @deprecated_function(zero_eight)
149
    def initialize(base):
150
        """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
151
152
        NOTE: This will soon be deprecated in favour of creation
153
        through a BzrDir.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
154
        """
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.
155
        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.
156
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
157
    @deprecated_function(zero_eight)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
158
    def setup_caching(self, cache_root):
159
        """Subclasses that care about caching should override this, and set
160
        up cached stores located under cache_root.
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
161
        
162
        NOTE: This is unused.
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
163
        """
1963.2.3 by Robey Pointer
be explicit about the deprecation of setup_caching and remove no-op destructor
164
        pass
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
165
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
166
    def get_config(self):
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
167
        return BranchConfig(self)
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
168
1185.35.11 by Aaron Bentley
Added support for branch nicks
169
    def _get_nick(self):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
170
        return self.get_config().get_nickname()
1185.35.11 by Aaron Bentley
Added support for branch nicks
171
172
    def _set_nick(self, nick):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
173
        self.get_config().set_user_option('nickname', nick)
1185.35.11 by Aaron Bentley
Added support for branch nicks
174
175
    nick = property(_get_nick, _set_nick)
1694.2.6 by Martin Pool
[merge] bzr.dev
176
177
    def is_locked(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
178
        raise NotImplementedError(self.is_locked)
1694.2.6 by Martin Pool
[merge] bzr.dev
179
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
180
    def lock_write(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
181
        raise NotImplementedError(self.lock_write)
1694.2.6 by Martin Pool
[merge] bzr.dev
182
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
183
    def lock_read(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
184
        raise NotImplementedError(self.lock_read)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
185
186
    def unlock(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
187
        raise NotImplementedError(self.unlock)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
188
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
189
    def peek_lock_mode(self):
190
        """Return lock mode for the Branch: 'r', 'w' or None"""
1185.70.6 by Martin Pool
review fixups from John
191
        raise NotImplementedError(self.peek_lock_mode)
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
192
1694.2.6 by Martin Pool
[merge] bzr.dev
193
    def get_physical_lock_status(self):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
194
        raise NotImplementedError(self.get_physical_lock_status)
1694.2.6 by Martin Pool
[merge] bzr.dev
195
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
196
    def abspath(self, name):
197
        """Return absolute filename for something in the branch
198
        
199
        XXX: Robert Collins 20051017 what is this used for? why is it a branch
200
        method and not a tree method.
201
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
202
        raise NotImplementedError(self.abspath)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
203
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
204
    def bind(self, other):
205
        """Bind the local branch the other branch.
206
207
        :param other: The branch to bind to
208
        :type other: Branch
209
        """
210
        raise errors.UpgradeRequired(self.base)
211
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.
212
    @needs_write_lock
213
    def fetch(self, from_branch, last_revision=None, pb=None):
214
        """Copy revisions from from_branch into this branch.
215
216
        :param from_branch: Where to copy from.
217
        :param last_revision: What revision to stop at (None for at the end
218
                              of the branch.
219
        :param pb: An optional progress bar to use.
220
221
        Returns the copied revision count and the failed revisions in a tuple:
222
        (copied, failures).
223
        """
224
        if self.base == from_branch.base:
1558.4.11 by Aaron Bentley
Allow merge against self, make fetching self a noop
225
            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.
226
        if pb is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
227
            nested_pb = ui.ui_factory.nested_progress_bar()
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
228
            pb = nested_pb
229
        else:
230
            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.
231
232
        from_branch.lock_read()
233
        try:
234
            if last_revision is None:
235
                pb.update('get source history')
2230.3.9 by Aaron Bentley
Fix most fetch tests
236
                last_revision = from_branch.last_revision()
237
                if last_revision is None:
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
238
                    last_revision = _mod_revision.NULL_REVISION
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.
239
            return self.repository.fetch(from_branch.repository,
240
                                         revision_id=last_revision,
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
241
                                         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.
242
        finally:
1594.1.3 by Robert Collins
Fixup pb usage to use nested_progress_bar.
243
            if nested_pb is not None:
244
                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.
245
            from_branch.unlock()
246
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
247
    def get_bound_location(self):
1558.7.6 by Aaron Bentley
Fixed typo (Olaf Conradi)
248
        """Return the URL of the branch we are bound to.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
249
250
        Older format branches cannot bind, please be sure to use a metadir
251
        branch.
252
        """
253
        return None
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
254
    
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
255
    def get_old_bound_location(self):
256
        """Return the URL of the branch we used to be bound to
257
        """
258
        raise errors.UpgradeRequired(self.base)
259
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
260
    def get_commit_builder(self, parents, config=None, timestamp=None, 
261
                           timezone=None, committer=None, revprops=None, 
262
                           revision_id=None):
263
        """Obtain a CommitBuilder for this branch.
264
        
265
        :param parents: Revision ids of the parents of the new revision.
266
        :param config: Optional configuration to use.
267
        :param timestamp: Optional timestamp recorded for commit.
268
        :param timezone: Optional timezone for timestamp.
269
        :param committer: Optional committer to set for commit.
270
        :param revprops: Optional dictionary of revision properties.
271
        :param revision_id: Optional revision id.
272
        """
273
274
        if config is None:
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
275
            config = self.get_config()
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
276
        
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
277
        return self.repository.get_commit_builder(self, parents, config,
1740.3.7 by Jelmer Vernooij
Move committer, log, revprops, timestamp and timezone to CommitBuilder.
278
            timestamp, timezone, committer, revprops, revision_id)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
279
280
    def get_master_branch(self):
281
        """Return the branch we are bound to.
282
        
283
        :return: Either a Branch, or None
284
        """
285
        return None
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
286
1770.3.2 by Jelmer Vernooij
Move BzrBranch.get_revision_delta() to Branch.get_revision_delta() as it is generic.
287
    def get_revision_delta(self, revno):
288
        """Return the delta for one revision.
289
290
        The delta is relative to its mainline predecessor, or the
291
        empty tree for revision 1.
292
        """
293
        assert isinstance(revno, int)
294
        rh = self.revision_history()
295
        if not (1 <= revno <= len(rh)):
296
            raise InvalidRevisionNumber(revno)
297
        return self.repository.get_revision_delta(rh[revno-1])
298
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
299
    def get_root_id(self):
300
        """Return the id of this branches root"""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
301
        raise NotImplementedError(self.get_root_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
302
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
303
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
304
        """Print `file` to stdout."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
305
        raise NotImplementedError(self.print_file)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
306
307
    def append_revision(self, *revision_ids):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
308
        raise NotImplementedError(self.append_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
309
310
    def set_revision_history(self, rev_history):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
311
        raise NotImplementedError(self.set_revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
312
313
    def revision_history(self):
314
        """Return sequence of revision hashes on to this branch."""
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
315
        raise NotImplementedError(self.revision_history)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
316
317
    def revno(self):
318
        """Return current revision number for this branch.
319
320
        That is equivalent to the number of revisions committed to
321
        this branch.
322
        """
323
        return len(self.revision_history())
324
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
325
    def unbind(self):
326
        """Older format branches cannot bind or unbind."""
327
        raise errors.UpgradeRequired(self.base)
328
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
329
    def set_append_revisions_only(self, enabled):
330
        """Older format branches are never restricted to append-only"""
2230.3.32 by Aaron Bentley
Implement strict history policy
331
        raise errors.UpgradeRequired(self.base)
332
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
333
    def last_revision(self):
1819.1.7 by Martin Pool
Fix up code to get revision_id of bzr for benchmark log file
334
        """Return last revision id, or None"""
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
335
        ph = self.revision_history()
336
        if ph:
337
            return ph[-1]
338
        else:
339
            return None
340
2249.4.1 by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow
341
    def last_revision_info(self):
342
        """Return information about the last revision.
343
344
        :return: A tuple (revno, last_revision_id).
345
        """
346
        rh = self.revision_history()
347
        revno = len(rh)
348
        if revno:
349
            return (revno, rh[-1])
350
        else:
351
            return (0, _mod_revision.NULL_REVISION)
352
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
353
    def missing_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
354
        """Return a list of new revisions that would perfectly fit.
355
        
356
        If self and other have not diverged, return a list of the revisions
357
        present in other, but missing from self.
358
        """
359
        self_history = self.revision_history()
360
        self_len = len(self_history)
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
361
        other_history = other.revision_history()
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
362
        other_len = len(other_history)
363
        common_index = min(self_len, other_len) -1
364
        if common_index >= 0 and \
365
            self_history[common_index] != other_history[common_index]:
366
            raise DivergedBranches(self, other)
367
368
        if stop_revision is None:
369
            stop_revision = other_len
370
        else:
371
            assert isinstance(stop_revision, int)
372
            if stop_revision > other_len:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
373
                raise errors.NoSuchRevision(self, stop_revision)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
374
        return other_history[self_len:stop_revision]
1185.66.1 by Aaron Bentley
Merged from mainline
375
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
376
    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
377
        """Pull in new perfect-fit revisions.
378
379
        :param other: Another Branch to pull from
380
        :param stop_revision: Updated until the given revision
381
        :return: None
382
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
383
        raise NotImplementedError(self.update_revisions)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
384
385
    def revision_id_to_revno(self, revision_id):
386
        """Given a revision id, return its revno"""
387
        if revision_id is None:
388
            return 0
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
389
        revision_id = osutils.safe_revision_id(revision_id)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
390
        history = self.revision_history()
391
        try:
392
            return history.index(revision_id) + 1
393
        except ValueError:
394
            raise bzrlib.errors.NoSuchRevision(self, revision_id)
395
396
    def get_rev_id(self, revno, history=None):
397
        """Find the revision id of the specified revno."""
398
        if revno == 0:
399
            return None
400
        if history is None:
401
            history = self.revision_history()
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
402
        if revno <= 0 or revno > len(history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
403
            raise bzrlib.errors.NoSuchRevision(self, revno)
404
        return history[revno - 1]
405
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
406
    def pull(self, source, overwrite=False, stop_revision=None):
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
407
        """Mirror source into this branch.
408
409
        This branch is considered to be 'local', having low latency.
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
410
411
        :returns: PullResult instance
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
412
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
413
        raise NotImplementedError(self.pull)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
414
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
415
    def push(self, target, overwrite=False, stop_revision=None):
416
        """Mirror this branch into target.
417
418
        This branch is considered to be 'local', having low latency.
419
        """
420
        raise NotImplementedError(self.push)
421
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
422
    def basis_tree(self):
1852.5.1 by Robert Collins
Deprecate EmptyTree in favour of using Repository.revision_tree.
423
        """Return `Tree` object for last revision."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
424
        return self.repository.revision_tree(self.last_revision())
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
425
426
    def rename_one(self, from_rel, to_rel):
427
        """Rename one file.
428
429
        This can change the directory or the filename or both.
430
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
431
        raise NotImplementedError(self.rename_one)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
432
433
    def move(self, from_paths, to_name):
434
        """Rename files.
435
436
        to_name must exist as a versioned directory.
437
438
        If to_name exists and is a directory, the files are moved into
439
        it, keeping their old names.  If it is a directory, 
440
441
        Note that to_name is only the last component of the new name;
442
        this doesn't change the directory.
443
444
        This returns a list of (from_path, to_path) pairs for each
445
        entry that is moved.
446
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
447
        raise NotImplementedError(self.move)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
448
449
    def get_parent(self):
450
        """Return the parent location of the branch.
451
452
        This is the default location for push/pull/missing.  The usual
453
        pattern is that the user can override it by specifying a
454
        location.
455
        """
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
456
        raise NotImplementedError(self.get_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
457
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
458
    def get_submit_branch(self):
459
        """Return the submit location of the branch.
460
461
        This is the default location for bundle.  The usual
462
        pattern is that the user can override it by specifying a
463
        location.
464
        """
465
        return self.get_config().get_user_option('submit_branch')
466
467
    def set_submit_branch(self, location):
468
        """Return the submit location of the branch.
469
470
        This is the default location for bundle.  The usual
471
        pattern is that the user can override it by specifying a
472
        location.
473
        """
474
        self.get_config().set_user_option('submit_branch', location)
475
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
476
    def get_push_location(self):
477
        """Return the None or the location to push this branch to."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
478
        raise NotImplementedError(self.get_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
479
480
    def set_push_location(self, location):
481
        """Set a new push location for this branch."""
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
482
        raise NotImplementedError(self.set_push_location)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
483
484
    def set_parent(self, url):
1910.3.2 by Andrew Bennetts
Improve some NotImplementedErrors.
485
        raise NotImplementedError(self.set_parent)
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
486
1587.1.10 by Robert Collins
update updates working tree and branch together.
487
    @needs_write_lock
488
    def update(self):
489
        """Synchronise this branch with the master branch if any. 
490
491
        :return: None or the last_revision pivoted out during the update.
492
        """
493
        return None
494
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
495
    def check_revno(self, revno):
496
        """\
497
        Check whether a revno corresponds to any revision.
498
        Zero (the NULL revision) is considered valid.
499
        """
500
        if revno != 0:
501
            self.check_real_revno(revno)
502
            
503
    def check_real_revno(self, revno):
504
        """\
505
        Check whether a revno corresponds to a real revision.
506
        Zero (the NULL revision) is considered invalid
507
        """
508
        if revno < 1 or revno > self.revno():
509
            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.
510
511
    @needs_read_lock
512
    def clone(self, *args, **kwargs):
513
        """Clone this branch into to_bzrdir preserving all semantic values.
514
        
515
        revision_id: if not None, the revision history in the new branch will
516
                     be truncated to end with revision_id.
517
        """
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
518
        # for API compatibility, until 0.8 releases we provide the old api:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
519
        # def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
520
        # after 0.8 releases, the *args and **kwargs should be changed:
521
        # def clone(self, to_bzrdir, revision_id=None):
522
        if (kwargs.get('to_location', None) or
523
            kwargs.get('revision', None) or
524
            kwargs.get('basis_branch', None) or
525
            (len(args) and isinstance(args[0], basestring))):
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
526
            # backwards compatibility api:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
527
            warn("Branch.clone() has been deprecated for BzrDir.clone() from"
528
                 " bzrlib 0.8.", DeprecationWarning, stacklevel=3)
529
            # get basis_branch
530
            if len(args) > 2:
531
                basis_branch = args[2]
532
            else:
533
                basis_branch = kwargs.get('basis_branch', None)
534
            if basis_branch:
535
                basis = basis_branch.bzrdir
536
            else:
537
                basis = None
538
            # get revision
539
            if len(args) > 1:
540
                revision_id = args[1]
541
            else:
542
                revision_id = kwargs.get('revision', None)
543
            # get location
544
            if len(args):
545
                url = args[0]
546
            else:
547
                # no default to raise if not provided.
548
                url = kwargs.get('to_location')
549
            return self.bzrdir.clone(url,
550
                                     revision_id=revision_id,
551
                                     basis=basis).open_branch()
552
        # new cleaner api.
553
        # generate args by hand 
554
        if len(args) > 1:
555
            revision_id = args[1]
556
        else:
557
            revision_id = kwargs.get('revision_id', None)
558
        if len(args):
559
            to_bzrdir = args[0]
560
        else:
561
            # no default to raise if not provided.
562
            to_bzrdir = kwargs.get('to_bzrdir')
563
        result = self._format.initialize(to_bzrdir)
564
        self.copy_content_into(result, revision_id=revision_id)
565
        return  result
566
567
    @needs_read_lock
568
    def sprout(self, to_bzrdir, revision_id=None):
569
        """Create a new line of development from the branch, into to_bzrdir.
570
        
571
        revision_id: if not None, the revision history in the new branch will
572
                     be truncated to end with revision_id.
573
        """
574
        result = self._format.initialize(to_bzrdir)
575
        self.copy_content_into(result, revision_id=revision_id)
576
        result.set_parent(self.bzrdir.root_transport.base)
577
        return result
578
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
579
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
580
        """Synchronize last revision and revision history between branches.
581
582
        This version is most efficient when the destination is also a
583
        BzrBranch5, but works for BzrBranch6 as long as the revision
584
        history is the true lefthand parent history, and all of the revisions
585
        are in the destination's repository.  If not, set_revision_history
586
        will fail.
587
588
        :param destination: The branch to copy the history into
589
        :param revision_id: The revision-id to truncate history at.  May
590
          be None to copy complete history.
591
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
592
        new_history = self.revision_history()
593
        if revision_id is not None:
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
594
            revision_id = osutils.safe_revision_id(revision_id)
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
595
            try:
596
                new_history = new_history[:new_history.index(revision_id) + 1]
597
            except ValueError:
598
                rev = self.repository.get_revision(revision_id)
599
                new_history = rev.get_history(self.repository)[1:]
600
        destination.set_revision_history(new_history)
601
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.
602
    @needs_read_lock
603
    def copy_content_into(self, destination, revision_id=None):
604
        """Copy the content of self into destination.
605
606
        revision_id: if not None, the revision history in the new branch will
607
                     be truncated to end with revision_id.
608
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
609
        self._synchronize_history(destination, revision_id)
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
610
        try:
611
            parent = self.get_parent()
612
        except errors.InaccessibleParent, e:
613
            mutter('parent was not accessible to copy: %s', e)
614
        else:
615
            if parent:
616
                destination.set_parent(parent)
1185.66.1 by Aaron Bentley
Merged from mainline
617
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
618
    @needs_read_lock
619
    def check(self):
620
        """Check consistency of the branch.
621
622
        In particular this checks that revisions given in the revision-history
623
        do actually match up in the revision graph, and that they're all 
624
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
625
        
626
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
627
628
        :return: A BranchCheckResult.
629
        """
630
        mainline_parent_id = None
631
        for revision_id in self.revision_history():
632
            try:
633
                revision = self.repository.get_revision(revision_id)
634
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
635
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
636
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
637
            # In general the first entry on the revision history has no parents.
638
            # But it's not illegal for it to have parents listed; this can happen
639
            # in imports from Arch when the parents weren't reachable.
640
            if mainline_parent_id is not None:
641
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
642
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
643
                                        "parents of {%s}"
644
                                        % (mainline_parent_id, revision_id))
645
            mainline_parent_id = revision_id
646
        return BranchCheckResult(self)
647
1910.2.39 by Aaron Bentley
Fix checkout bug
648
    def _get_checkout_format(self):
649
        """Return the most suitable metadir for a checkout of this branch.
650
        Weaves are used if this branch's repostory uses weaves.
651
        """
652
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
653
            from bzrlib.repofmt import weaverepo
1910.2.39 by Aaron Bentley
Fix checkout bug
654
            format = bzrdir.BzrDirMetaFormat1()
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
655
            format.repository_format = weaverepo.RepositoryFormat7()
1910.2.39 by Aaron Bentley
Fix checkout bug
656
        else:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
657
            format = self.repository.bzrdir.checkout_metadir()
2230.3.23 by Aaron Bentley
Make checkouts imitate parent format
658
            format.branch_format = self._format
1910.2.39 by Aaron Bentley
Fix checkout bug
659
        return format
660
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
661
    def create_checkout(self, to_location, revision_id=None,
1551.8.5 by Aaron Bentley
Change name to create_checkout
662
                        lightweight=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
663
        """Create a checkout of a branch.
664
        
665
        :param to_location: The url to produce the checkout at
666
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
667
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
668
        produce a bound branch (heavyweight checkout)
669
        :return: The tree of the created checkout
670
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
671
        t = transport.get_transport(to_location)
672
        try:
673
            t.mkdir('.')
674
        except errors.FileExists:
675
            pass
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
676
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
677
            format = self._get_checkout_format()
678
            checkout = format.initialize_on_transport(t)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
679
            BranchReferenceFormat().initialize(checkout, self)
680
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
681
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
682
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
683
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
684
            checkout = checkout_branch.bzrdir
685
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
686
            # pull up to the specified revision_id to set the initial 
687
            # branch tip correctly, and seed it with history.
688
            checkout_branch.pull(self, stop_revision=revision_id)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
689
        tree = checkout.create_workingtree(revision_id)
2100.3.27 by Aaron Bentley
Enable nested commits
690
        for path, entry in tree.iter_reference_entries():
691
            path = tree.id2path(entry.file_id)
692
            reference_parent = self.reference_parent(entry.file_id, path)
693
            reference_parent.create_checkout(tree.abspath(path),
694
                                             entry.reference_revision,
695
                                             lightweight)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
696
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
697
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
698
    def reference_parent(self, file_id, path):
2100.3.29 by Aaron Bentley
Get merge working initially
699
        """Return the parent branch for a tree-reference file_id
700
        :param file_id: The file_id of the tree reference
701
        :param path: The path of the file_id in the tree
702
        :return: A branch associated with the file_id
703
        """
704
        # FIXME should provide multiple branches, based on config
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
705
        return Branch.open(self.bzrdir.root_transport.clone(path).base)
706
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
707
    def supports_tags(self):
708
        return self._format.supports_tags()
709
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
710
711
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
712
    """An encapsulation of the initialization and open routines for a format.
713
714
    Formats provide three things:
715
     * An initialization routine,
716
     * a format string,
717
     * an open routine.
718
719
    Formats are placed in an dict by their format string for reference 
720
    during branch opening. Its not required that these be instances, they
721
    can be classes themselves with class methods - it simply depends on 
722
    whether state is needed for a given format or not.
723
724
    Once a format is deprecated, just deprecate the initialize and open
725
    methods on the format class. Do not deprecate the object, as the 
726
    object will be created every time regardless.
727
    """
728
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
729
    _default_format = None
730
    """The default format used for new branches."""
731
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
732
    _formats = {}
733
    """The known formats."""
734
735
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
736
    def find_format(klass, a_bzrdir):
737
        """Return the format for the branch object in a_bzrdir."""
738
        try:
739
            transport = a_bzrdir.get_branch_transport(None)
740
            format_string = transport.get("format").read()
741
            return klass._formats[format_string]
742
        except NoSuchFile:
743
            raise NotBranchError(path=transport.base)
744
        except KeyError:
1740.5.6 by Martin Pool
Clean up many exception classes.
745
            raise errors.UnknownFormatError(format=format_string)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
746
747
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
748
    def get_default_format(klass):
749
        """Return the current default format."""
750
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
751
752
    def get_format_string(self):
753
        """Return the ASCII format string that identifies this format."""
754
        raise NotImplementedError(self.get_format_string)
755
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
756
    def get_format_description(self):
757
        """Return the short format description for this format."""
2258.1.1 by Robert Collins
Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
758
        raise NotImplementedError(self.get_format_description)
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
759
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
760
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
761
                           set_format=True):
762
        """Initialize a branch in a bzrdir, with specified files
763
764
        :param a_bzrdir: The bzrdir to initialize the branch in
765
        :param utf8_files: The files to create as a list of
766
            (filename, content) tuples
767
        :param set_format: If True, set the format with
768
            self.get_format_string.  (BzrBranch4 has its format set
769
            elsewhere)
770
        :return: a branch in this format
771
        """
772
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
773
        branch_transport = a_bzrdir.get_branch_transport(self)
774
        lock_map = {
775
            'metadir': ('lock', lockdir.LockDir),
776
            'branch4': ('branch-lock', lockable_files.TransportLock),
777
        }
778
        lock_name, lock_class = lock_map[lock_type]
779
        control_files = lockable_files.LockableFiles(branch_transport,
780
            lock_name, lock_class)
781
        control_files.create_lock()
782
        control_files.lock_write()
783
        if set_format:
784
            control_files.put_utf8('format', self.get_format_string())
785
        try:
786
            for file, content in utf8_files:
787
                control_files.put_utf8(file, content)
788
        finally:
789
            control_files.unlock()
790
        return self.open(a_bzrdir, _found=True)
791
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
792
    def initialize(self, a_bzrdir):
793
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
794
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
795
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.
796
    def is_supported(self):
797
        """Is this format supported?
798
799
        Supported formats can be initialized and opened.
800
        Unsupported formats may not support initialization or committing or 
801
        some other features depending on the reason for not being supported.
802
        """
803
        return True
804
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
805
    def open(self, a_bzrdir, _found=False):
806
        """Return the branch object for a_bzrdir
807
808
        _found is a private parameter, do not use it. It is used to indicate
809
               if format probing has already be done.
810
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
811
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
812
813
    @classmethod
814
    def register_format(klass, format):
815
        klass._formats[format.get_format_string()] = format
816
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.
817
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
818
    def set_default_format(klass, format):
819
        klass._default_format = format
820
821
    @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.
822
    def unregister_format(klass, format):
823
        assert klass._formats[format.get_format_string()] is format
824
        del klass._formats[format.get_format_string()]
825
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
826
    def __str__(self):
827
        return self.get_format_string().rstrip()
828
2220.2.10 by Martin Pool
(broken) start moving things to branches
829
    def supports_tags(self):
830
        """True if this format supports tags stored in the branch"""
831
        return False  # by default
832
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
833
    # XXX: Probably doesn't really belong here -- mbp 20070212
2220.2.10 by Martin Pool
(broken) start moving things to branches
834
    def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
835
            lock_class):
836
        branch_transport = a_bzrdir.get_branch_transport(self)
837
        control_files = lockable_files.LockableFiles(branch_transport,
838
            lock_filename, lock_class)
839
        control_files.create_lock()
840
        control_files.lock_write()
841
        try:
842
            for filename, content in utf8_files:
843
                control_files.put_utf8(filename, content)
844
        finally:
845
            control_files.unlock()
846
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
847
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
848
class BranchHooks(dict):
849
    """A dictionary mapping hook name to a list of callables for branch hooks.
850
    
851
    e.g. ['set_rh'] Is the list of items to be called when the
852
    set_revision_history function is invoked.
853
    """
854
855
    def __init__(self):
856
        """Create the default hooks.
857
858
        These are all empty initially, because by default nothing should get
859
        notified.
860
        """
861
        dict.__init__(self)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
862
        # Introduced in 0.15:
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
863
        # invoked whenever the revision history has been set
864
        # with set_revision_history. The api signature is
865
        # (branch, revision_history), and the branch will
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
866
        # be write-locked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
867
        self['set_rh'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
868
        # invoked after a push operation completes.
869
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
870
        # (push_result)
871
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
872
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
873
        # where local is the local branch or None, master is the target 
874
        # master branch, and the rest should be self explanatory. The source
875
        # is read locked and the target branches write locked. Source will
876
        # be the local low-latency branch.
877
        self['post_push'] = []
878
        # invoked after a pull operation completes.
879
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
880
        # (pull_result)
881
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
882
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
883
        # where local is the local branch or None, master is the target 
884
        # master branch, and the rest should be self explanatory. The source
885
        # is read locked and the target branches write locked. The local
886
        # branch is the low-latency branch.
887
        self['post_pull'] = []
888
        # invoked after a commit operation completes.
889
        # the api signature is 
890
        # (local, master, old_revno, old_revid, new_revno, new_revid)
891
        # old_revid is NULL_REVISION for the first commit to a branch.
892
        self['post_commit'] = []
893
        # invoked after a uncommit operation completes.
894
        # the api signature is
895
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
896
        # local is the local branch or None, master is the target branch,
897
        # and an empty branch recieves new_revno of 0, new_revid of None.
898
        self['post_uncommit'] = []
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
899
900
    def install_hook(self, hook_name, a_callable):
901
        """Install a_callable in to the hook hook_name.
902
903
        :param hook_name: A hook name. See the __init__ method of BranchHooks
904
            for the complete list of hooks.
905
        :param a_callable: The callable to be invoked when the hook triggers.
906
            The exact signature will depend on the hook - see the __init__ 
907
            method of BranchHooks for details on each hook.
908
        """
909
        try:
910
            self[hook_name].append(a_callable)
911
        except KeyError:
912
            raise errors.UnknownHook('branch', hook_name)
913
914
915
# install the default hooks into the Branch class.
916
Branch.hooks = BranchHooks()
917
918
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
919
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
920
    """Bzr branch format 4.
921
922
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
923
     - 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.
924
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
925
    """
926
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
927
    def get_format_description(self):
928
        """See BranchFormat.get_format_description()."""
929
        return "Branch format 4"
930
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
931
    def initialize(self, a_bzrdir):
932
        """Create a branch of this format in a_bzrdir."""
933
        utf8_files = [('revision-history', ''),
934
                      ('branch-name', ''),
935
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
936
        return self._initialize_helper(a_bzrdir, utf8_files,
937
                                       lock_type='branch4', set_format=False)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
938
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
939
    def __init__(self):
940
        super(BzrBranchFormat4, self).__init__()
941
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
942
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
943
    def open(self, a_bzrdir, _found=False):
944
        """Return the branch object for a_bzrdir
945
946
        _found is a private parameter, do not use it. It is used to indicate
947
               if format probing has already be done.
948
        """
949
        if not _found:
950
            # we are being called directly and must probe.
951
            raise NotImplementedError
952
        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.
953
                         _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.
954
                         a_bzrdir=a_bzrdir,
955
                         _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.
956
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
957
    def __str__(self):
958
        return "Bazaar-NG branch format 4"
959
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
960
961
class BzrBranchFormat5(BranchFormat):
962
    """Bzr branch format 5.
963
964
    This format has:
965
     - a revision-history file.
966
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
967
     - a lock dir guarding the branch itself
968
     - 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.
969
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
970
971
    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.
972
    """
973
974
    def get_format_string(self):
975
        """See BranchFormat.get_format_string()."""
976
        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
977
978
    def get_format_description(self):
979
        """See BranchFormat.get_format_description()."""
980
        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.
981
        
982
    def initialize(self, a_bzrdir):
983
        """Create a branch of this format in a_bzrdir."""
984
        utf8_files = [('revision-history', ''),
985
                      ('branch-name', ''),
986
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
987
        return self._initialize_helper(a_bzrdir, utf8_files)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
988
989
    def __init__(self):
990
        super(BzrBranchFormat5, self).__init__()
991
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
992
993
    def open(self, a_bzrdir, _found=False):
994
        """Return the branch object for a_bzrdir
995
996
        _found is a private parameter, do not use it. It is used to indicate
997
               if format probing has already be done.
998
        """
999
        if not _found:
1000
            format = BranchFormat.find_format(a_bzrdir)
1001
            assert format.__class__ == self.__class__
1002
        transport = a_bzrdir.get_branch_transport(None)
1996.3.3 by John Arbash Meinel
Shave off another 40ms by demand loading branch and bzrdir
1003
        control_files = lockable_files.LockableFiles(transport, 'lock',
1004
                                                     lockdir.LockDir)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1005
        return BzrBranch5(_format=self,
1006
                          _control_files=control_files,
1007
                          a_bzrdir=a_bzrdir,
1008
                          _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.
1009
2220.2.10 by Martin Pool
(broken) start moving things to branches
1010
2230.3.1 by Aaron Bentley
Get branch6 creation working
1011
class BzrBranchFormat6(BzrBranchFormat5):
1012
    """Branch format with last-revision
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1013
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1014
    Unlike previous formats, this has no explicit revision history. Instead,
1015
    this just stores the last-revision, and the left-hand history leading
1016
    up to there is the history.
1017
1018
    This format was introduced in bzr 0.15
2230.3.1 by Aaron Bentley
Get branch6 creation working
1019
    """
1020
1021
    def get_format_string(self):
1022
        """See BranchFormat.get_format_string()."""
1023
        return "Bazaar-NG branch format 6\n"
1024
1025
    def get_format_description(self):
1026
        """See BranchFormat.get_format_description()."""
1027
        return "Branch format 6"
1028
1029
    def initialize(self, a_bzrdir):
1030
        """Create a branch of this format in a_bzrdir."""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1031
        utf8_files = [('last-revision', '0 null:\n'),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1032
                      ('branch-name', ''),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1033
                      ('branch.conf', ''),
1034
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1035
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1036
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1037
1038
    def open(self, a_bzrdir, _found=False):
1039
        """Return the branch object for a_bzrdir
1040
1041
        _found is a private parameter, do not use it. It is used to indicate
1042
               if format probing has already be done.
1043
        """
1044
        if not _found:
1045
            format = BranchFormat.find_format(a_bzrdir)
1046
            assert format.__class__ == self.__class__
1047
        transport = a_bzrdir.get_branch_transport(None)
1048
        control_files = lockable_files.LockableFiles(transport, 'lock',
1049
                                                     lockdir.LockDir)
1050
        return BzrBranch6(_format=self,
1051
                          _control_files=control_files,
1052
                          a_bzrdir=a_bzrdir,
1053
                          _repository=a_bzrdir.find_repository())
1054
2220.2.27 by Martin Pool
Start adding tags to Branch6
1055
    def supports_tags(self):
1056
        return True
1057
2230.3.1 by Aaron Bentley
Get branch6 creation working
1058
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.
1059
class BranchReferenceFormat(BranchFormat):
1060
    """Bzr branch reference format.
1061
1062
    Branch references are used in implementing checkouts, they
1063
    act as an alias to the real branch which is at some other url.
1064
1065
    This format has:
1066
     - A location file
1067
     - a format string
1068
    """
1069
1070
    def get_format_string(self):
1071
        """See BranchFormat.get_format_string()."""
1072
        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
1073
1074
    def get_format_description(self):
1075
        """See BranchFormat.get_format_description()."""
1076
        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.
1077
        
1078
    def initialize(self, a_bzrdir, target_branch=None):
1079
        """Create a branch of this format in a_bzrdir."""
1080
        if target_branch is None:
1081
            # this format does not implement branch itself, thus the implicit
1082
            # creation contract must see it as uninitializable
1083
            raise errors.UninitializableFormat(self)
1084
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1085
        branch_transport = a_bzrdir.get_branch_transport(self)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
1086
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1087
            target_branch.bzrdir.root_transport.base)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
1088
        branch_transport.put_bytes('format', self.get_format_string())
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.
1089
        return self.open(a_bzrdir, _found=True)
1090
1091
    def __init__(self):
1092
        super(BranchReferenceFormat, self).__init__()
1093
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1094
1095
    def _make_reference_clone_function(format, a_branch):
1096
        """Create a clone() routine for a branch dynamically."""
1097
        def clone(to_bzrdir, revision_id=None):
1098
            """See Branch.clone()."""
1099
            return format.initialize(to_bzrdir, a_branch)
1100
            # cannot obey revision_id limits when cloning a reference ...
1101
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1102
            # emit some sort of warning/error to the caller ?!
1103
        return clone
1104
1105
    def open(self, a_bzrdir, _found=False):
1106
        """Return the branch that the branch reference in a_bzrdir points at.
1107
1108
        _found is a private parameter, do not use it. It is used to indicate
1109
               if format probing has already be done.
1110
        """
1111
        if not _found:
1112
            format = BranchFormat.find_format(a_bzrdir)
1113
            assert format.__class__ == self.__class__
1114
        transport = a_bzrdir.get_branch_transport(None)
1115
        real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
1116
        result = real_bzrdir.open_branch()
1117
        # this changes the behaviour of result.clone to create a new reference
1118
        # rather than a copy of the content of the branch.
1119
        # I did not use a proxy object because that needs much more extensive
1120
        # testing, and we are only changing one behaviour at the moment.
1121
        # If we decide to alter more behaviours - i.e. the implicit nickname
1122
        # then this should be refactored to introduce a tested proxy branch
1123
        # and a subclass of that for use in overriding clone() and ....
1124
        # - RBC 20060210
1125
        result.clone = self._make_reference_clone_function(result)
1126
        return result
1127
1128
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1129
# formats which have no format string are not discoverable
1130
# 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.
1131
__default_format = BzrBranchFormat5()
1132
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.
1133
BranchFormat.register_format(BranchReferenceFormat())
2230.3.1 by Aaron Bentley
Get branch6 creation working
1134
BranchFormat.register_format(BzrBranchFormat6())
2230.3.28 by Aaron Bentley
Restore default formats
1135
BranchFormat.set_default_format(__default_format)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1136
_legacy_formats = [BzrBranchFormat4(),
1137
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1138
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1139
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1140
    """A branch stored in the actual filesystem.
1141
1142
    Note that it's "local" in the context of the filesystem; it doesn't
1143
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1144
    it's writable, and can be accessed via the normal filesystem API.
1 by mbp at sourcefrog
import from baz patch-364
1145
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1146
    
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1147
    def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1534.4.32 by Robert Collins
Rename deprecated_nonce to DEPRECATED_PARAMETER
1148
                 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.
1149
                 _control_files=None, a_bzrdir=None, _repository=None):
1 by mbp at sourcefrog
import from baz patch-364
1150
        """Create new branch object at a particular location.
1151
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1152
        transport -- A Transport object, defining how to access files.
62 by mbp at sourcefrog
- new find_branch_root function; based on suggestion from aaron
1153
        
254 by Martin Pool
- Doc cleanups from Magnus Therning
1154
        init -- If True, create new control files in a previously
1 by mbp at sourcefrog
import from baz patch-364
1155
             unversioned directory.  If False, the branch must already
1156
             be versioned.
1157
1293 by Martin Pool
- add Branch constructor option to relax version check
1158
        relax_version_check -- If true, the usual check for the branch
1159
            version is not applied.  This is intended only for
1160
            upgrade/recovery type use; it's not guaranteed that
1161
            all operations will work on old format branches.
1 by mbp at sourcefrog
import from baz patch-364
1162
        """
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
1163
        Branch.__init__(self)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1164
        if a_bzrdir is None:
1165
            self.bzrdir = bzrdir.BzrDir.open(transport.base)
1166
        else:
1167
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1168
        # self._transport used to point to the directory containing the
1169
        # control directory, but was not used - now it's just the transport
1170
        # for the branch control files.  mbp 20070212
1171
        self._base = self.bzrdir.transport.clone('..').base
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1172
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1173
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1174
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1175
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1176
        self._transport = _control_files._transport
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1177
        if deprecated_passed(init):
1178
            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.
1179
                 "deprecated as of bzr 0.8. Please use Branch.create().",
1180
                 DeprecationWarning,
1181
                 stacklevel=2)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1182
            if init:
1183
                # this is slower than before deprecation, oh well never mind.
1184
                # -> its deprecated.
1185
                self._initialize(transport.base)
1534.4.28 by Robert Collins
first cut at merge from integration.
1186
        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.
1187
        if deprecated_passed(relax_version_check):
1188
            warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1189
                 "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.
1190
                 "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.
1191
                 "open() method.",
1192
                 DeprecationWarning,
1193
                 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.
1194
            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.
1195
                and not self._format.is_supported()):
1740.5.6 by Martin Pool
Clean up many exception classes.
1196
                raise errors.UnsupportedFormatError(format=fmt)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1197
        if deprecated_passed(transport):
1198
            warn("BzrBranch.__init__(transport=XXX...): The transport "
1199
                 "parameter is deprecated as of bzr 0.8. "
1200
                 "Please use Branch.open, or bzrdir.open_branch().",
1201
                 DeprecationWarning,
1202
                 stacklevel=2)
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
1203
        self.repository = _repository
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1204
1 by mbp at sourcefrog
import from baz patch-364
1205
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1206
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1207
1208
    __repr__ = __str__
1209
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1210
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1211
        """Returns the directory containing the control directory."""
1185.69.2 by John Arbash Meinel
Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
1212
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1213
1442.1.5 by Robert Collins
Give branch.base a docstring.
1214
    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,
1215
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1216
    def _finish_transaction(self):
1217
        """Exit the current transaction."""
1185.65.13 by Robert Collins
Merge from integration
1218
        return self.control_files._finish_transaction()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1219
1220
    def get_transaction(self):
1185.65.13 by Robert Collins
Merge from integration
1221
        """Return the current active transaction.
1222
1223
        If no transaction is active, this returns a passthrough object
1224
        for which all data is immediately flushed and no caching happens.
1225
        """
1226
        # this is an explicit function so that we can do tricky stuff
1227
        # when the storage in rev_storage is elsewhere.
1228
        # we probably need to hook the two 'lock a location' and 
1229
        # 'have a transaction' together more delicately, so that
1230
        # we can have two locks (branch and storage) and one transaction
1231
        # ... and finishing the transaction unlocks both, but unlocking
1232
        # does not. - RBC 20051121
1233
        return self.control_files.get_transaction()
1234
1235
    def _set_transaction(self, transaction):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
1236
        """Set a new active transaction."""
1185.65.13 by Robert Collins
Merge from integration
1237
        return self.control_files._set_transaction(transaction)
353 by Martin Pool
- Per-branch locks in read and write modes.
1238
67 by mbp at sourcefrog
use abspath() for the function that makes an absolute
1239
    def abspath(self, name):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1240
        """See Branch.abspath."""
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1241
        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.
1242
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.
1243
    def _check_format(self, format):
1534.4.8 by Robert Collins
Unfuck upgrade.
1244
        """Identify the branch format if needed.
1 by mbp at sourcefrog
import from baz patch-364
1245
1534.4.8 by Robert Collins
Unfuck upgrade.
1246
        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.
1247
        self._format for code that needs to check it later.
1 by mbp at sourcefrog
import from baz patch-364
1248
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1249
        The format parameter is either None or the branch format class
1250
        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.
1251
1252
        FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
163 by mbp at sourcefrog
merge win32 portability fixes
1253
        """
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1254
        if format is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1255
            format = BranchFormat.find_format(self.bzrdir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1256
        self._format = format
1257
        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.
1258
1508.1.15 by Robert Collins
Merge from mpool.
1259
    @needs_read_lock
909 by Martin Pool
- merge John's code to give the tree root an explicit file id
1260
    def get_root_id(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1261
        """See Branch.get_root_id."""
1534.4.28 by Robert Collins
first cut at merge from integration.
1262
        tree = self.repository.revision_tree(self.last_revision())
1263
        return tree.inventory.root.file_id
1 by mbp at sourcefrog
import from baz patch-364
1264
1694.2.6 by Martin Pool
[merge] bzr.dev
1265
    def is_locked(self):
1266
        return self.control_files.is_locked()
1267
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1268
    def lock_write(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1269
        self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1270
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1271
            self.control_files.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1272
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1273
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1274
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1275
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1276
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1277
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1278
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1279
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1280
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1281
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1282
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1283
1284
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1285
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1286
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1287
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1288
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1289
            self.repository.unlock()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1290
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1291
    def peek_lock_mode(self):
1292
        if self.control_files._lock_count == 0:
1293
            return None
1294
        else:
1295
            return self.control_files._lock_mode
1296
1694.2.6 by Martin Pool
[merge] bzr.dev
1297
    def get_physical_lock_status(self):
1298
        return self.control_files.get_physical_lock_status()
1299
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1300
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1301
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1302
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1303
        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.
1304
1305
    @needs_write_lock
905 by Martin Pool
- merge aaron's append_multiple.patch
1306
    def append_revision(self, *revision_ids):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1307
        """See Branch.append_revision."""
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1308
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
905 by Martin Pool
- merge aaron's append_multiple.patch
1309
        for revision_id in revision_ids:
2229.2.3 by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY
1310
            _mod_revision.check_not_reserved_id(revision_id)
905 by Martin Pool
- merge aaron's append_multiple.patch
1311
            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.
1312
        rev_history = self.revision_history()
1313
        rev_history.extend(revision_ids)
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1314
        self.set_revision_history(rev_history)
1315
2230.3.49 by Aaron Bentley
Fix cache updating
1316
    def _write_revision_history(self, history):
1317
        """Factored out of set_revision_history.
1318
1319
        This performs the actual writing to disk.
1320
        It is intended to be called by BzrBranch5.set_revision_history."""
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1321
        self.control_files.put_bytes(
2230.3.49 by Aaron Bentley
Fix cache updating
1322
            'revision-history', '\n'.join(history))
1323
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1324
    @needs_write_lock
1325
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1326
        """See Branch.set_revision_history."""
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1327
        rev_history = [osutils.safe_revision_id(r) for r in rev_history]
2230.3.49 by Aaron Bentley
Fix cache updating
1328
        self._write_revision_history(rev_history)
1563.2.34 by Robert Collins
Remove the commit and rollback transaction methods as misleading, and implement a WriteTransaction
1329
        transaction = self.get_transaction()
1330
        history = transaction.map.find_revision_history()
1331
        if history is not None:
1332
            # update the revision history in the identity map.
1333
            history[:] = list(rev_history)
1334
            # this call is disabled because revision_history is 
1335
            # not really an object yet, and the transaction is for objects.
1336
            # transaction.register_dirty(history)
1337
        else:
1338
            transaction.map.add_revision_history(rev_history)
1339
            # this call is disabled because revision_history is 
1340
            # not really an object yet, and the transaction is for objects.
1341
            # transaction.register_clean(history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1342
        for hook in Branch.hooks['set_rh']:
1343
            hook(self, rev_history)
233 by mbp at sourcefrog
- more output from test.sh
1344
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1345
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1346
    def set_last_revision_info(self, revno, revision_id):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1347
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1348
        history = self._lefthand_history(revision_id)
1349
        assert len(history) == revno, '%d != %d' % (len(history), revno)
1350
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1351
2230.4.1 by Aaron Bentley
Get log as fast branch5
1352
    def _gen_revision_history(self):
2255.7.81 by John Arbash Meinel
Be optimistic about .bzr/branch/revision-history already being in utf8.
1353
        history = [l.rstrip('\r\n') for l in
2230.4.1 by Aaron Bentley
Get log as fast branch5
1354
                self.control_files.get('revision-history').readlines()]
1355
        return history
1356
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1357
    @needs_read_lock
1 by mbp at sourcefrog
import from baz patch-364
1358
    def revision_history(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1359
        """See Branch.revision_history."""
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1360
        transaction = self.get_transaction()
1361
        history = transaction.map.find_revision_history()
1362
        if history is not None:
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1363
            # mutter("cache hit for revision-history in %s", self)
1417.1.12 by Robert Collins
cache revision history during read transactions
1364
            return list(history)
2230.4.1 by Aaron Bentley
Get log as fast branch5
1365
        history = self._gen_revision_history()
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1366
        transaction.map.add_revision_history(history)
1367
        # this call is disabled because revision_history is 
1368
        # not really an object yet, and the transaction is for objects.
1369
        # transaction.register_clean(history, precious=True)
1370
        return list(history)
1 by mbp at sourcefrog
import from baz patch-364
1371
2230.3.2 by Aaron Bentley
Get all branch tests passing
1372
    def _lefthand_history(self, revision_id, last_rev=None,
1373
                          other_branch=None):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1374
        # stop_revision must be a descendant of last_revision
1375
        stop_graph = self.repository.get_revision_graph(revision_id)
1376
        if last_rev is not None and last_rev not in stop_graph:
1377
            # our previous tip is not merged into stop_revision
1378
            raise errors.DivergedBranches(self, other_branch)
1379
        # make a new revision history from the graph
1380
        current_rev_id = revision_id
1381
        new_history = []
1996.3.12 by John Arbash Meinel
Change how 'revision' is imported to avoid problems later
1382
        while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1383
            new_history.append(current_rev_id)
1384
            current_rev_id_parents = stop_graph[current_rev_id]
1385
            try:
1386
                current_rev_id = current_rev_id_parents[0]
1387
            except IndexError:
1388
                current_rev_id = None
1389
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1390
        return new_history
1391
1392
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1393
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1394
        other_branch=None):
1395
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1396
2230.3.2 by Aaron Bentley
Get all branch tests passing
1397
        :param revision_id: the new tip to use.
1398
        :param last_rev: The previous last_revision. If not None, then this
1399
            must be a ancestory of revision_id, or DivergedBranches is raised.
1400
        :param other_branch: The other branch that DivergedBranches should
1401
            raise with respect to.
1402
        """
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1403
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1404
        self.set_revision_history(self._lefthand_history(revision_id,
1405
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1406
1407
    @needs_write_lock
1505.1.21 by John Arbash Meinel
Removing changes for bound branch by invading set-revision-history.
1408
    def update_revisions(self, other, stop_revision=None):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1409
        """See Branch.update_revisions."""
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1410
        other.lock_read()
1411
        try:
1412
            if stop_revision is None:
1413
                stop_revision = other.last_revision()
1414
                if stop_revision is None:
1415
                    # if there are no commits, we're done.
1416
                    return
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1417
            else:
1418
                stop_revision = osutils.safe_revision_id(stop_revision)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1419
            # whats the current last revision, before we fetch [and change it
1420
            # possibly]
1421
            last_rev = self.last_revision()
1422
            # we fetch here regardless of whether we need to so that we pickup
1423
            # filled in ghosts.
1424
            self.fetch(other, stop_revision)
1425
            my_ancestry = self.repository.get_ancestry(last_rev)
1426
            if stop_revision in my_ancestry:
1427
                # last_revision is a descendant of stop_revision
1428
                return
1800.1.1 by Robert Collins
(robertc)Merge Branch.generate_revision_history() helper routine to create new revision histories.
1429
            self.generate_revision_history(stop_revision, last_rev=last_rev,
1430
                other_branch=other)
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1431
        finally:
1432
            other.unlock()
1185.12.44 by abentley
Restored branch convergence to bzr pull
1433
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1434
    def basis_tree(self):
1435
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1436
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1437
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1438
    @deprecated_method(zero_eight)
1 by mbp at sourcefrog
import from baz patch-364
1439
    def working_tree(self):
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1440
        """Create a Working tree object for this branch."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1441
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1442
        from bzrlib.transport.local import LocalTransport
1534.4.28 by Robert Collins
first cut at merge from integration.
1443
        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.
1444
            not isinstance(self._transport, LocalTransport)):
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1445
            raise NoWorkingTree(self.base)
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
1446
        return self.bzrdir.open_workingtree()
1 by mbp at sourcefrog
import from baz patch-364
1447
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1448
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1449
    def pull(self, source, overwrite=False, stop_revision=None,
1450
        _hook_master=None, _run_hooks=True):
1451
        """See Branch.pull.
1452
1453
        :param _hook_master: Private parameter - set the branch to 
1454
            be supplied as the master to push hooks.
1455
        :param _run_hooks: Private parameter - allow disabling of
1456
            hooks, used when pushing to a master branch.
1457
        """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1458
        result = PullResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1459
        result.source_branch = source
1460
        result.target_branch = self
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1461
        source.lock_read()
1462
        try:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1463
            result.old_revno, result.old_revid = self.last_revision_info()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1464
            try:
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
1465
                self.update_revisions(source, stop_revision)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1466
            except DivergedBranches:
1467
                if not overwrite:
1468
                    raise
1185.50.5 by John Arbash Meinel
pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)
1469
            if overwrite:
1551.10.22 by Aaron Bentley
Fix pull --overwrite for bundles
1470
                if stop_revision is None:
1471
                    stop_revision = source.last_revision()
1472
                self.generate_revision_history(stop_revision)
2220.2.36 by Martin Pool
Push and pull operations now merge tags and report conflicts in their result
1473
            result.tag_conflicts = source.tags.merge_to(self.tags)
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1474
            result.new_revno, result.new_revid = self.last_revision_info()
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1475
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1476
                result.master_branch = _hook_master
1477
                result.local_branch = self
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1478
            else:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1479
                result.master_branch = self
1480
                result.local_branch = None
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1481
            if _run_hooks:
1482
                for hook in Branch.hooks['post_pull']:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1483
                    hook(result)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1484
        finally:
1485
            source.unlock()
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1486
        return result
1 by mbp at sourcefrog
import from baz patch-364
1487
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1488
    def _get_parent_location(self):
1489
        _locs = ['parent', 'pull', 'x-pull']
1490
        for l in _locs:
1491
            try:
1492
                return self.control_files.get(l).read().strip('\n')
1493
            except NoSuchFile:
1494
                pass
1495
        return None
1496
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1497
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1498
    def push(self, target, overwrite=False, stop_revision=None,
1499
        _hook_master=None, _run_hooks=True):
1500
        """See Branch.push.
1501
        
1502
        :param _hook_master: Private parameter - set the branch to 
1503
            be supplied as the master to push hooks.
1504
        :param _run_hooks: Private parameter - allow disabling of
1505
            hooks, used when pushing to a master branch.
1506
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1507
        result = PushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1508
        result.source_branch = self
1509
        result.target_branch = target
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1510
        target.lock_write()
1511
        try:
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1512
            result.old_revno, result.old_revid = target.last_revision_info()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1513
            try:
1514
                target.update_revisions(self, stop_revision)
1515
            except DivergedBranches:
1516
                if not overwrite:
1517
                    raise
1518
            if overwrite:
1519
                target.set_revision_history(self.revision_history())
2220.2.36 by Martin Pool
Push and pull operations now merge tags and report conflicts in their result
1520
            result.tag_conflicts = self.tags.merge_to(target.tags)
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1521
            result.new_revno, result.new_revid = target.last_revision_info()
1522
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1523
                result.master_branch = _hook_master
1524
                result.local_branch = target
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1525
            else:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1526
                result.master_branch = target
1527
                result.local_branch = None
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1528
            if _run_hooks:
1529
                for hook in Branch.hooks['post_push']:
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1530
                    hook(result)
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1531
        finally:
1532
            target.unlock()
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1533
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1534
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1535
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1536
        """See Branch.get_parent."""
1773.4.3 by Martin Pool
[merge] bzr.dev
1537
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1538
        assert self.base[-1] == '/'
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1539
        parent = self._get_parent_location()
1540
        if parent is None:
1541
            return parent
1542
        # This is an old-format absolute path to a local branch
1543
        # turn it into a url
1544
        if parent.startswith('/'):
1545
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1546
        try:
1547
            return urlutils.join(self.base[:-1], parent)
1548
        except errors.InvalidURLJoin, e:
1549
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1550
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1551
    def get_push_location(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1552
        """See Branch.get_push_location."""
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1553
        push_loc = self.get_config().get_user_option('push_location')
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1554
        return push_loc
1555
1556
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1557
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1558
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1559
            'push_location', location,
1560
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1561
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1562
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1563
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1564
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1565
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1566
        # URLs should never be unicode, even on the local fs,
1567
        # FIXUP this and get_parent in a future branch format bump:
1568
        # read and rewrite the file, and have the new format code read
1569
        # using .get not .get_utf8. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1570
        if url is not None:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1571
            if isinstance(url, unicode):
1572
                try: 
1573
                    url = url.encode('ascii')
1574
                except UnicodeEncodeError:
1575
                    raise bzrlib.errors.InvalidURL(url,
1576
                        "Urls must be 7-bit ascii, "
1577
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1578
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1579
        self._set_parent_location(url)
1580
1581
    def _set_parent_location(self, url):
1582
        if url is None:
1583
            self.control_files._transport.delete('parent')
1584
        else:
1585
            assert isinstance(url, str)
2249.5.11 by John Arbash Meinel
Audit Branch to ensure utf8 revision ids.
1586
            self.control_files.put_bytes('parent', url + '\n')
1150 by Martin Pool
- add new Branch.set_parent and tests
1587
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1588
    @deprecated_function(zero_nine)
1185.35.11 by Aaron Bentley
Added support for branch nicks
1589
    def tree_config(self):
1770.2.11 by Aaron Bentley
Deprecated Branch.tree_config
1590
        """DEPRECATED; call get_config instead.  
1591
        TreeConfig has become part of BranchConfig."""
1185.35.11 by Aaron Bentley
Added support for branch nicks
1592
        return TreeConfig(self)
1593
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1594
1595
class BzrBranch5(BzrBranch):
1596
    """A format 5 branch. This supports new features over plan branches.
1597
1598
    It has support for a master_branch which is the data for bound branches.
1599
    """
1600
1601
    def __init__(self,
1602
                 _format,
1603
                 _control_files,
1604
                 a_bzrdir,
1605
                 _repository):
1606
        super(BzrBranch5, self).__init__(_format=_format,
1607
                                         _control_files=_control_files,
1608
                                         a_bzrdir=a_bzrdir,
1609
                                         _repository=_repository)
1610
        
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1611
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1612
    def pull(self, source, overwrite=False, stop_revision=None,
1613
        _run_hooks=True):
1614
        """Extends branch.pull to be bound branch aware.
1615
        
1616
        :param _run_hooks: Private parameter used to force hook running
1617
            off during bound branch double-pushing.
1618
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1619
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1620
        master_branch = None
1621
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1622
            # not pulling from master, so we need to update master.
1623
            master_branch = self.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1624
            master_branch.lock_write()
1625
        try:
1626
            if master_branch:
1627
                # pull from source into master.
1628
                master_branch.pull(source, overwrite, stop_revision,
1629
                    _run_hooks=False)
1630
            return super(BzrBranch5, self).pull(source, overwrite,
1631
                stop_revision, _hook_master=master_branch,
1632
                _run_hooks=_run_hooks)
1633
        finally:
1634
            if master_branch:
1635
                master_branch.unlock()
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1636
2279.1.1 by John Arbash Meinel
Branch.push() only needs a read lock.
1637
    @needs_read_lock
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1638
    def push(self, target, overwrite=False, stop_revision=None):
1639
        """Updates branch.push to be bound branch aware."""
1640
        bound_location = target.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1641
        master_branch = None
1642
        if bound_location and target.base != bound_location:
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1643
            # not pushing to master, so we need to update master.
1644
            master_branch = target.get_master_branch()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1645
            master_branch.lock_write()
1646
        try:
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1647
            if master_branch:
1648
                # push into the master from this branch.
1649
                super(BzrBranch5, self).push(master_branch, overwrite,
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1650
                    stop_revision, _run_hooks=False)
1651
            # and push into the target branch from this. Note that we push from
1652
            # this branch again, because its considered the highest bandwidth
1653
            # repository.
1654
            return super(BzrBranch5, self).push(target, overwrite,
1655
                stop_revision, _hook_master=master_branch)
1656
        finally:
1657
            if master_branch:
1658
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1659
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1660
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1661
        try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1662
            return self.control_files.get_utf8('bound').read()[:-1]
1663
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1664
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1665
1666
    @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.
1667
    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
1668
        """Return the branch we are bound to.
1669
        
1670
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1671
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1672
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1673
        it must be revalidated on each new lock.
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1674
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1675
        # 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
1676
        """
1677
        bound_loc = self.get_bound_location()
1678
        if not bound_loc:
1679
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1680
        try:
1681
            return Branch.open(bound_loc)
1682
        except (errors.NotBranchError, errors.ConnectionError), e:
1683
            raise errors.BoundBranchConnectionFailure(
1684
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1685
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1686
    @needs_write_lock
1687
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1688
        """Set the target where this branch is bound to.
1689
1690
        :param location: URL to the target branch
1691
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1692
        if location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1693
            self.control_files.put_utf8('bound', location+'\n')
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1694
        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.
1695
            try:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1696
                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.
1697
            except NoSuchFile:
1698
                return False
1699
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1700
1701
    @needs_write_lock
1702
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1703
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1704
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1705
        This does not push or pull data between the branches, though it does
1706
        check for divergence to raise an error when the branches are not
1707
        either the same, or one a prefix of the other. That behaviour may not
1708
        be useful, so that check may be removed in future.
1709
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1710
        :param other: The branch to bind to
1711
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1712
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1713
        # TODO: jam 20051230 Consider checking if the target is bound
1714
        #       It is debatable whether you should be able to bind to
1715
        #       a branch which is itself bound.
1716
        #       Committing is obviously forbidden,
1717
        #       but binding itself may not be.
1718
        #       Since we *have* to check at commit time, we don't
1719
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1720
1721
        # we want to raise diverged if:
1722
        # last_rev is not in the other_last_rev history, AND
1723
        # other_last_rev is not in our history, and do it without pulling
1724
        # history around
1725
        last_rev = self.last_revision()
1726
        if last_rev is not None:
1727
            other.lock_read()
1728
            try:
1729
                other_last_rev = other.last_revision()
1730
                if other_last_rev is not None:
1731
                    # neither branch is new, we have to do some work to
1732
                    # ascertain diversion.
1733
                    remote_graph = other.repository.get_revision_graph(
1734
                        other_last_rev)
1735
                    local_graph = self.repository.get_revision_graph(last_rev)
1736
                    if (last_rev not in remote_graph and
1737
                        other_last_rev not in local_graph):
1738
                        raise errors.DivergedBranches(self, other)
1739
            finally:
1740
                other.unlock()
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1741
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1742
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1743
    @needs_write_lock
1744
    def unbind(self):
1745
        """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.
1746
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1747
1587.1.10 by Robert Collins
update updates working tree and branch together.
1748
    @needs_write_lock
1749
    def update(self):
1750
        """Synchronise this branch with the master branch if any. 
1751
1752
        :return: None or the last_revision that was pivoted out during the
1753
                 update.
1754
        """
1755
        master = self.get_master_branch()
1756
        if master is not None:
1757
            old_tip = self.last_revision()
1758
            self.pull(master, overwrite=True)
1587.1.11 by Robert Collins
Local commits appear to be working properly.
1759
            if old_tip in self.repository.get_ancestry(self.last_revision()):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1760
                return None
1761
            return old_tip
1762
        return None
1763
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1764
2220.2.10 by Martin Pool
(broken) start moving things to branches
1765
class BzrBranchExperimental(BzrBranch5):
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1766
    """Bzr experimental branch format
1767
1768
    This format has:
1769
     - a revision-history file.
1770
     - a format string
1771
     - a lock dir guarding the branch itself
1772
     - all of this stored in a branch/ subdirectory
1773
     - works with shared repositories.
1774
     - a tag dictionary in the branch
1775
1776
    This format is new in bzr 0.15, but shouldn't be used for real data, 
1777
    only for testing.
1778
1779
    This class acts as it's own BranchFormat.
1780
    """
1781
1782
    _matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1783
1784
    @classmethod
1785
    def get_format_string(cls):
1786
        """See BranchFormat.get_format_string()."""
1787
        return "Bazaar-NG branch format experimental\n"
1788
1789
    @classmethod
1790
    def get_format_description(cls):
1791
        """See BranchFormat.get_format_description()."""
1792
        return "Experimental branch format"
1793
1794
    @classmethod
1795
    def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1796
            lock_class):
1797
        branch_transport = a_bzrdir.get_branch_transport(cls)
1798
        control_files = lockable_files.LockableFiles(branch_transport,
1799
            lock_filename, lock_class)
1800
        control_files.create_lock()
1801
        control_files.lock_write()
1802
        try:
1803
            for filename, content in utf8_files:
1804
                control_files.put_utf8(filename, content)
1805
        finally:
1806
            control_files.unlock()
1807
        
1808
    @classmethod
1809
    def initialize(cls, a_bzrdir):
1810
        """Create a branch of this format in a_bzrdir."""
1811
        utf8_files = [('format', cls.get_format_string()),
1812
                      ('revision-history', ''),
1813
                      ('branch-name', ''),
1814
                      ('tags', ''),
1815
                      ]
1816
        cls._initialize_control_files(a_bzrdir, utf8_files,
1817
            'lock', lockdir.LockDir)
1818
        return cls.open(a_bzrdir, _found=True)
1819
1820
    @classmethod
1821
    def open(cls, a_bzrdir, _found=False):
1822
        """Return the branch object for a_bzrdir
1823
1824
        _found is a private parameter, do not use it. It is used to indicate
1825
               if format probing has already be done.
1826
        """
1827
        if not _found:
1828
            format = BranchFormat.find_format(a_bzrdir)
1829
            assert format.__class__ == cls
1830
        transport = a_bzrdir.get_branch_transport(None)
1831
        control_files = lockable_files.LockableFiles(transport, 'lock',
1832
                                                     lockdir.LockDir)
1833
        return cls(_format=cls,
1834
            _control_files=control_files,
1835
            a_bzrdir=a_bzrdir,
1836
            _repository=a_bzrdir.find_repository())
1837
1838
    @classmethod
1839
    def is_supported(cls):
1840
        return True
1841
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
1842
    def _make_tags(self):
1843
        return BasicTags(self)
2220.2.10 by Martin Pool
(broken) start moving things to branches
1844
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
1845
    @classmethod
1846
    def supports_tags(cls):
1847
        return True
1848
2220.2.10 by Martin Pool
(broken) start moving things to branches
1849
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
1850
BranchFormat.register_format(BzrBranchExperimental)
1851
1852
2230.3.1 by Aaron Bentley
Get branch6 creation working
1853
class BzrBranch6(BzrBranch5):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1854
1855
    @needs_read_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1856
    def last_revision_info(self):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1857
        revision_string = self.control_files.get('last-revision').read()
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1858
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1859
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1860
        revno = int(revno)
1861
        return revno, revision_id
1862
2230.3.2 by Aaron Bentley
Get all branch tests passing
1863
    def last_revision(self):
1864
        """Return last revision id, or None"""
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1865
        revision_id = self.last_revision_info()[1]
2230.3.2 by Aaron Bentley
Get all branch tests passing
1866
        if revision_id == _mod_revision.NULL_REVISION:
1867
            revision_id = None
1868
        return revision_id
1869
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1870
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
1871
        """Simply write out the revision id, with no checks.
1872
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1873
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
1874
1875
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1876
        Intended to be called by set_last_revision_info and
1877
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
1878
        """
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1879
        if revision_id is None:
1880
            revision_id = 'null:'
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1881
        out_string = '%d %s\n' % (revno, revision_id)
2249.5.17 by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken
1882
        self.control_files.put_bytes('last-revision', out_string)
2230.3.2 by Aaron Bentley
Get all branch tests passing
1883
2230.3.49 by Aaron Bentley
Fix cache updating
1884
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1885
    def set_last_revision_info(self, revno, revision_id):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1886
        revision_id = osutils.safe_revision_id(revision_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1887
        if self._get_append_revisions_only():
1888
            self._check_history_violation(revision_id)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1889
        self._write_last_revision_info(revno, revision_id)
2230.3.49 by Aaron Bentley
Fix cache updating
1890
        transaction = self.get_transaction()
1891
        cached_history = transaction.map.find_revision_history()
1892
        if cached_history is not None:
1893
            transaction.map.remove_object(cached_history)
1894
2230.3.32 by Aaron Bentley
Implement strict history policy
1895
    def _check_history_violation(self, revision_id):
1896
        last_revision = self.last_revision()
1897
        if last_revision is None:
1898
            return
1899
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
1900
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
1901
2230.4.1 by Aaron Bentley
Get log as fast branch5
1902
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
1903
        """Generate the revision history from last revision
1904
        """
2230.3.54 by Aaron Bentley
Move reverse history iteration to repository
1905
        history = list(self.repository.iter_reverse_revision_history(
1906
            self.last_revision()))
2230.4.1 by Aaron Bentley
Get log as fast branch5
1907
        history.reverse()
1908
        return history
2230.3.2 by Aaron Bentley
Get all branch tests passing
1909
2230.3.49 by Aaron Bentley
Fix cache updating
1910
    def _write_revision_history(self, history):
1911
        """Factored out of set_revision_history.
1912
1913
        This performs the actual writing to disk, with format-specific checks.
1914
        It is intended to be called by BzrBranch5.set_revision_history.
1915
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
1916
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
1917
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
1918
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1919
            if history != self._lefthand_history(history[-1]):
1920
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
1921
            last_revision = history[-1]
1922
        if self._get_append_revisions_only():
1923
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1924
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1925
2230.3.3 by Aaron Bentley
Add more config testing
1926
    @needs_write_lock
2230.3.9 by Aaron Bentley
Fix most fetch tests
1927
    def append_revision(self, *revision_ids):
2249.5.19 by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8
1928
        revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
2230.3.9 by Aaron Bentley
Fix most fetch tests
1929
        if len(revision_ids) == 0:
1930
            return
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1931
        prev_revno, prev_revision = self.last_revision_info()
2230.3.9 by Aaron Bentley
Fix most fetch tests
1932
        for revision in self.repository.get_revisions(revision_ids):
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1933
            if prev_revision == _mod_revision.NULL_REVISION:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1934
                if revision.parent_ids != []:
1935
                    raise errors.NotLeftParentDescendant(self, prev_revision,
1936
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
1937
            else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
1938
                if revision.parent_ids[0] != prev_revision:
1939
                    raise errors.NotLeftParentDescendant(self, prev_revision,
1940
                                                         revision.revision_id)
2230.3.9 by Aaron Bentley
Fix most fetch tests
1941
            prev_revision = revision.revision_id
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1942
        self.set_last_revision_info(prev_revno + len(revision_ids),
1943
                                    revision_ids[-1])
2230.3.9 by Aaron Bentley
Fix most fetch tests
1944
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1945
    def _set_config_location(self, name, url, config=None,
1946
                             make_relative=False):
1947
        if config is None:
1948
            config = self.get_config()
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1949
        if url is None:
1950
            url = ''
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1951
        elif make_relative:
1952
            url = urlutils.relative_url(self.base, url)
1953
        config.set_user_option(name, url)
1954
1955
1956
    def _get_config_location(self, name, config=None):
1957
        if config is None:
1958
            config = self.get_config()
1959
        location = config.get_user_option(name)
1960
        if location == '':
1961
            location = None
1962
        return location
1963
1964
    @needs_write_lock
1965
    def _set_parent_location(self, url):
1966
        """Set the parent branch"""
1967
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
1968
1969
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1970
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
1971
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1972
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
1973
1974
    def set_push_location(self, location):
1975
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1976
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
1977
1978
    def set_bound_location(self, location):
1979
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
1980
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1981
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
1982
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1983
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
1984
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1985
            else:
1986
                config.set_user_option('bound', 'False')
1987
                return True
1988
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
1989
            self._set_config_location('bound_location', location,
1990
                                      config=config)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
1991
            config.set_user_option('bound', 'True')
1992
        return True
1993
1994
    def _get_bound_location(self, bound):
1995
        """Return the bound location in the config file.
1996
1997
        Return None if the bound parameter does not match"""
1998
        config = self.get_config()
1999
        config_bound = (config.get_user_option('bound') == 'True')
2000
        if config_bound != bound:
2001
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2002
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2003
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2004
    def get_bound_location(self):
2005
        """See Branch.set_push_location."""
2006
        return self._get_bound_location(True)
2007
2008
    def get_old_bound_location(self):
2009
        """See Branch.get_old_bound_location"""
2010
        return self._get_bound_location(False)
2011
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2012
    def set_append_revisions_only(self, enabled):
2013
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2014
            value = 'True'
2015
        else:
2016
            value = 'False'
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2017
        self.get_config().set_user_option('append_revisions_only', value)
2230.3.32 by Aaron Bentley
Implement strict history policy
2018
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2019
    def _get_append_revisions_only(self):
2020
        value = self.get_config().get_user_option('append_revisions_only')
2021
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2022
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2023
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2024
        """Synchronize last revision and revision history between branches.
2025
2026
        This version is most efficient when the destination is also a
2027
        BzrBranch6, but works for BzrBranch5, as long as the destination's
2028
        repository contains all the lefthand ancestors of the intended
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2029
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2030
2031
        :param destination: The branch to copy the history into
2032
        :param revision_id: The revision-id to truncate history at.  May
2033
          be None to copy complete history.
2034
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2035
        if revision_id is None:
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2036
            revno, revision_id = self.last_revision_info()
2037
        else:
2038
            revno = self.revision_id_to_revno(revision_id)
2039
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2040
2220.2.27 by Martin Pool
Start adding tags to Branch6
2041
    def _make_tags(self):
2042
        return BasicTags(self)
2043
2230.3.34 by Aaron Bentley
cleanup
2044
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2045
class BranchTestProviderAdapter(object):
2046
    """A tool to generate a suite testing multiple branch formats at once.
2047
2048
    This is done by copying the test once for each transport and injecting
2049
    the transport_server, transport_readonly_server, and branch_format
2050
    classes into each copy. Each copy is also given a new id() to make it
2051
    easy to identify.
2052
    """
2053
2054
    def __init__(self, transport_server, transport_readonly_server, formats):
2055
        self._transport_server = transport_server
2056
        self._transport_readonly_server = transport_readonly_server
2057
        self._formats = formats
2058
    
2059
    def adapt(self, test):
2060
        result = TestSuite()
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2061
        for branch_format, bzrdir_format in self._formats:
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2062
            new_test = deepcopy(test)
2063
            new_test.transport_server = self._transport_server
2064
            new_test.transport_readonly_server = self._transport_readonly_server
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
2065
            new_test.bzrdir_format = bzrdir_format
2066
            new_test.branch_format = branch_format
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2067
            def make_new_test_id():
2220.2.13 by mbp at sourcefrog
reconnect and fix up lower-level tests for tags
2068
                # the format can be either a class or an instance
2069
                name = getattr(branch_format, '__name__',
2070
                        branch_format.__class__.__name__)
2071
                new_id = "%s(%s)" % (new_test.id(), name)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
2072
                return lambda: new_id
2073
            new_test.id = make_new_test_id()
2074
            result.addTest(new_test)
2075
        return result
2076
2077
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2078
######################################################################
2079
# results of operations
2080
2220.2.37 by Martin Pool
Report conflicting tags from push.
2081
2082
class _Result(object):
2083
2084
    def _show_tag_conficts(self, to_file):
2085
        if not getattr(self, 'tag_conflicts', None):
2086
            return
2087
        to_file.write('Conflicting tags:\n')
2088
        for name, value1, value2 in self.tag_conflicts:
2089
            to_file.write('    %s\n' % (name, ))
2090
2091
2092
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2093
    """Result of a Branch.pull operation.
2094
2095
    :ivar old_revno: Revision number before pull.
2096
    :ivar new_revno: Revision number after pull.
2097
    :ivar old_revid: Tip revision id before pull.
2098
    :ivar new_revid: Tip revision id after pull.
2099
    :ivar source_branch: Source (local) branch object.
2100
    :ivar master_branch: Master branch of the target, or None.
2101
    :ivar target_branch: Target/destination branch object.
2102
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2103
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2104
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2105
        # DEPRECATED: pull used to return the change in revno
2106
        return self.new_revno - self.old_revno
2107
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2108
    def report(self, to_file):
2109
        if self.old_revid == self.new_revid:
2110
            to_file.write('No revisions to pull.\n')
2111
        else:
2112
            to_file.write('Now on revision %d.\n' % self.new_revno)
2113
        self._show_tag_conficts(to_file)
2114
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2115
2220.2.37 by Martin Pool
Report conflicting tags from push.
2116
class PushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2117
    """Result of a Branch.push operation.
2118
2119
    :ivar old_revno: Revision number before push.
2120
    :ivar new_revno: Revision number after push.
2121
    :ivar old_revid: Tip revision id before push.
2122
    :ivar new_revid: Tip revision id after push.
2123
    :ivar source_branch: Source branch object.
2124
    :ivar master_branch: Master branch of the target, or None.
2125
    :ivar target_branch: Target/destination branch object.
2126
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2127
2128
    def __int__(self):
2129
        # DEPRECATED: push used to return the change in revno
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2130
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2131
2220.2.37 by Martin Pool
Report conflicting tags from push.
2132
    def report(self, to_file):
2133
        """Write a human-readable description of the result."""
2134
        if self.old_revid == self.new_revid:
2135
            to_file.write('No new revisions to push.\n')
2136
        else:
2137
            to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2138
        self._show_tag_conficts(to_file)
2139
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2140
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2141
class BranchCheckResult(object):
2142
    """Results of checking branch consistency.
2143
2144
    :see: Branch.check
2145
    """
2146
2147
    def __init__(self, branch):
2148
        self.branch = branch
2149
2150
    def report_results(self, verbose):
2151
        """Report the check results via trace.note.
2152
        
2153
        :param verbose: Requests more detailed display of what was checked,
2154
            if any.
2155
        """
2156
        note('checked branch %s format %s',
2157
             self.branch.base,
2158
             self.branch._format)
2159
2160
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2161
class Converter5to6(object):
2162
    """Perform an in-place upgrade of format 5 to format 6"""
2163
2164
    def convert(self, branch):
2165
        # Data for 5 and 6 can peacefully coexist.
2166
        format = BzrBranchFormat6()
2167
        new_branch = format.open(branch.bzrdir, _found=True)
2168
2169
        # Copy source data into target
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2170
        new_branch.set_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2171
        new_branch.set_parent(branch.get_parent())
2172
        new_branch.set_bound_location(branch.get_bound_location())
2173
        new_branch.set_push_location(branch.get_push_location())
2174
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2175
        # New branch has no tags by default
2176
        new_branch.tags._set_tag_dict({})
2177
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2178
        # Copying done; now update target format
2179
        new_branch.control_files.put_utf8('format',
2180
            format.get_format_string())
2181
2182
        # Clean up old files
2183
        new_branch.control_files._transport.delete('revision-history')
2184
        try:
2185
            branch.set_parent(None)
2186
        except NoSuchFile:
2187
            pass
2188
        branch.set_bound_location(None)