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