/brz/remove-bazaar

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