/brz/remove-bazaar

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