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