/brz/remove-bazaar

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