/brz/remove-bazaar

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