/brz/remove-bazaar

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