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