~bzr-pqm/bzr/bzr.dev

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