/brz/remove-bazaar

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