/brz/remove-bazaar

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