/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.
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
682
683
        to_bzrdir controls the branch format.
684
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.
685
        revision_id: if not None, the revision history in the new branch will
686
                     be truncated to end with revision_id.
687
        """
3650.2.1 by Aaron Bentley
Fix sprout to honour cloning format
688
        result = to_bzrdir.create_branch()
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.
689
        self.copy_content_into(result, revision_id=revision_id)
690
        result.set_parent(self.bzrdir.root_transport.base)
691
        return result
692
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
693
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
694
        """Synchronize last revision and revision history between branches.
695
696
        This version is most efficient when the destination is also a
697
        BzrBranch5, but works for BzrBranch6 as long as the revision
698
        history is the true lefthand parent history, and all of the revisions
699
        are in the destination's repository.  If not, set_revision_history
700
        will fail.
701
702
        :param destination: The branch to copy the history into
703
        :param revision_id: The revision-id to truncate history at.  May
704
          be None to copy complete history.
705
        """
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
706
        if revision_id == _mod_revision.NULL_REVISION:
707
            new_history = []
3650.3.3 by Aaron Bentley
fix sprout
708
        else:
709
            new_history = self.revision_history()
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
710
        if revision_id is not None and new_history != []:
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
711
            try:
712
                new_history = new_history[:new_history.index(revision_id) + 1]
713
            except ValueError:
714
                rev = self.repository.get_revision(revision_id)
715
                new_history = rev.get_history(self.repository)[1:]
716
        destination.set_revision_history(new_history)
717
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.
718
    @needs_read_lock
719
    def copy_content_into(self, destination, revision_id=None):
720
        """Copy the content of self into destination.
721
722
        revision_id: if not None, the revision history in the new branch will
723
                     be truncated to end with revision_id.
724
        """
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
725
        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)
726
        try:
727
            parent = self.get_parent()
728
        except errors.InaccessibleParent, e:
729
            mutter('parent was not accessible to copy: %s', e)
730
        else:
731
            if parent:
732
                destination.set_parent(parent)
2348.2.1 by Marien Zwart
Properly push tags if push creates a new branch.
733
        self.tags.merge_to(destination.tags)
1185.66.1 by Aaron Bentley
Merged from mainline
734
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
735
    @needs_read_lock
736
    def check(self):
737
        """Check consistency of the branch.
738
739
        In particular this checks that revisions given in the revision-history
740
        do actually match up in the revision graph, and that they're all 
741
        present in the repository.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
742
        
743
        Callers will typically also want to check the repository.
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
744
745
        :return: A BranchCheckResult.
746
        """
747
        mainline_parent_id = None
3389.2.1 by John Arbash Meinel
Add code to 'bzr check' to detect when the mainline history is inconsistent.
748
        last_revno, last_revision_id = self.last_revision_info()
749
        real_rev_history = list(self.repository.iter_reverse_revision_history(
750
                                last_revision_id))
751
        real_rev_history.reverse()
752
        if len(real_rev_history) != last_revno:
753
            raise errors.BzrCheckError('revno does not match len(mainline)'
754
                ' %s != %s' % (last_revno, len(real_rev_history)))
755
        # TODO: We should probably also check that real_rev_history actually
756
        #       matches self.revision_history()
757
        for revision_id in real_rev_history:
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
758
            try:
759
                revision = self.repository.get_revision(revision_id)
760
            except errors.NoSuchRevision, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
761
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
762
                            % revision_id)
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
763
            # In general the first entry on the revision history has no parents.
764
            # But it's not illegal for it to have parents listed; this can happen
765
            # in imports from Arch when the parents weren't reachable.
766
            if mainline_parent_id is not None:
767
                if mainline_parent_id not in revision.parent_ids:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
768
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
769
                                        "parents of {%s}"
770
                                        % (mainline_parent_id, revision_id))
771
            mainline_parent_id = revision_id
772
        return BranchCheckResult(self)
773
1910.2.39 by Aaron Bentley
Fix checkout bug
774
    def _get_checkout_format(self):
775
        """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.
776
        Weaves are used if this branch's repository uses weaves.
1910.2.39 by Aaron Bentley
Fix checkout bug
777
        """
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.
778
        if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
779
            from bzrlib.repofmt import weaverepo
1910.2.39 by Aaron Bentley
Fix checkout bug
780
            format = bzrdir.BzrDirMetaFormat1()
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
781
            format.repository_format = weaverepo.RepositoryFormat7()
1910.2.39 by Aaron Bentley
Fix checkout bug
782
        else:
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
783
            format = self.repository.bzrdir.checkout_metadir()
2370.3.2 by John Arbash Meinel
Use BzrDir.set_branch_format() rather than setting it directly.
784
            format.set_branch_format(self._format)
1910.2.39 by Aaron Bentley
Fix checkout bug
785
        return format
786
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
787
    def create_checkout(self, to_location, revision_id=None,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
788
                        lightweight=False, accelerator_tree=None,
789
                        hardlink=False):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
790
        """Create a checkout of a branch.
791
        
792
        :param to_location: The url to produce the checkout at
793
        :param revision_id: The revision to check out
1551.8.5 by Aaron Bentley
Change name to create_checkout
794
        :param lightweight: If True, produce a lightweight checkout, otherwise,
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
795
        produce a bound branch (heavyweight checkout)
3123.5.17 by Aaron Bentley
Update docs
796
        :param accelerator_tree: A tree which can be used for retrieving file
797
            contents more quickly than the revision tree, i.e. a workingtree.
798
            The revision tree will be used for cases where accelerator_tree's
799
            content is different.
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
800
        :param hardlink: If true, hard-link files from accelerator_tree,
801
            where possible.
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
802
        :return: The tree of the created checkout
803
        """
1910.2.39 by Aaron Bentley
Fix checkout bug
804
        t = transport.get_transport(to_location)
2475.3.3 by John Arbash Meinel
Change calls to try/mkdir('.')/except FileExists to ensure_base()
805
        t.ensure_base()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
806
        if lightweight:
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
807
            format = self._get_checkout_format()
808
            checkout = format.initialize_on_transport(t)
2955.5.3 by Vincent Ladeuil
Fix second unwanted connection by providing the right branch to create_checkout.
809
            from_branch = BranchReferenceFormat().initialize(checkout, self)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
810
        else:
1910.2.39 by Aaron Bentley
Fix checkout bug
811
            format = self._get_checkout_format()
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
812
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1910.2.39 by Aaron Bentley
Fix checkout bug
813
                to_location, force_new_tree=False, format=format)
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
814
            checkout = checkout_branch.bzrdir
815
            checkout_branch.bind(self)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
816
            # pull up to the specified revision_id to set the initial 
817
            # branch tip correctly, and seed it with history.
818
            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.
819
            from_branch=None
820
        tree = checkout.create_workingtree(revision_id,
3123.5.2 by Aaron Bentley
Allow checkout --files_from
821
                                           from_branch=from_branch,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
822
                                           accelerator_tree=accelerator_tree,
823
                                           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.
824
        basis_tree = tree.basis_tree()
825
        basis_tree.lock_read()
826
        try:
827
            for path, file_id in basis_tree.iter_references():
828
                reference_parent = self.reference_parent(file_id, path)
829
                reference_parent.create_checkout(tree.abspath(path),
830
                    basis_tree.get_reference_revision(file_id, path),
831
                    lightweight)
832
        finally:
833
            basis_tree.unlock()
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
834
        return tree
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
835
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
836
    @needs_write_lock
837
    def reconcile(self, thorough=True):
838
        """Make sure the data stored in this branch is consistent."""
839
        from bzrlib.reconcile import BranchReconciler
840
        reconciler = BranchReconciler(self, thorough=thorough)
841
        reconciler.reconcile()
842
        return reconciler
843
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
844
    def reference_parent(self, file_id, path):
2100.3.29 by Aaron Bentley
Get merge working initially
845
        """Return the parent branch for a tree-reference file_id
846
        :param file_id: The file_id of the tree reference
847
        :param path: The path of the file_id in the tree
848
        :return: A branch associated with the file_id
849
        """
850
        # FIXME should provide multiple branches, based on config
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
851
        return Branch.open(self.bzrdir.root_transport.clone(path).base)
852
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
853
    def supports_tags(self):
854
        return self._format.supports_tags()
855
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.
856
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
857
                                         other_branch):
3441.5.18 by Andrew Bennetts
Fix some test failures.
858
        """Ensure that revision_b is a descendant of revision_a.
859
860
        This is a helper function for update_revisions.
861
        
862
        :raises: DivergedBranches if revision_b has diverged from revision_a.
863
        :returns: True if revision_b is a descendant of revision_a.
864
        """
865
        relation = self._revision_relations(revision_a, revision_b, graph)
866
        if relation == 'b_descends_from_a':
867
            return True
868
        elif relation == 'diverged':
869
            raise errors.DivergedBranches(self, other_branch)
870
        elif relation == 'a_descends_from_b':
871
            return False
872
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
873
            raise AssertionError("invalid relation: %r" % (relation,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
874
875
    def _revision_relations(self, revision_a, revision_b, graph):
876
        """Determine the relationship between two revisions.
877
        
878
        :returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
879
        """
880
        heads = graph.heads([revision_a, revision_b])
881
        if heads == set([revision_b]):
882
            return 'b_descends_from_a'
883
        elif heads == set([revision_a, revision_b]):
884
            # These branches have diverged
885
            return 'diverged'
886
        elif heads == set([revision_a]):
887
            return 'a_descends_from_b'
888
        else:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
889
            raise AssertionError("invalid heads: %r" % (heads,))
3441.5.18 by Andrew Bennetts
Fix some test failures.
890
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
891
892
class BranchFormat(object):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
893
    """An encapsulation of the initialization and open routines for a format.
894
895
    Formats provide three things:
896
     * An initialization routine,
897
     * a format string,
898
     * an open routine.
899
900
    Formats are placed in an dict by their format string for reference 
901
    during branch opening. Its not required that these be instances, they
902
    can be classes themselves with class methods - it simply depends on 
903
    whether state is needed for a given format or not.
904
905
    Once a format is deprecated, just deprecate the initialize and open
906
    methods on the format class. Do not deprecate the object, as the 
907
    object will be created every time regardless.
908
    """
909
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
910
    _default_format = None
911
    """The default format used for new branches."""
912
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
913
    _formats = {}
914
    """The known formats."""
915
2363.5.5 by Aaron Bentley
add info.describe_format
916
    def __eq__(self, other):
917
        return self.__class__ is other.__class__
918
919
    def __ne__(self, other):
920
        return not (self == other)
921
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
922
    @classmethod
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
923
    def find_format(klass, a_bzrdir):
924
        """Return the format for the branch object in a_bzrdir."""
925
        try:
926
            transport = a_bzrdir.get_branch_transport(None)
927
            format_string = transport.get("format").read()
928
            return klass._formats[format_string]
3236.1.2 by Michael Hudson
clean up branch.py imports
929
        except errors.NoSuchFile:
930
            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.
931
        except KeyError:
3246.3.2 by Daniel Watkins
Modified uses of errors.UnknownFormatError.
932
            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.
933
934
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
935
    def get_default_format(klass):
936
        """Return the current default format."""
937
        return klass._default_format
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
938
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
939
    def get_reference(self, a_bzrdir):
940
        """Get the target reference of the branch in a_bzrdir.
941
942
        format probing must have been completed before calling
943
        this method - it is assumed that the format of the branch
944
        in a_bzrdir is correct.
945
946
        :param a_bzrdir: The bzrdir to get the branch data from.
947
        :return: None if the branch is not a reference branch.
948
        """
949
        return None
950
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
951
    @classmethod
952
    def set_reference(self, a_bzrdir, to_branch):
953
        """Set the target reference of the branch in a_bzrdir.
954
955
        format probing must have been completed before calling
956
        this method - it is assumed that the format of the branch
957
        in a_bzrdir is correct.
958
959
        :param a_bzrdir: The bzrdir to set the branch reference for.
960
        :param to_branch: branch that the checkout is to reference
961
        """
962
        raise NotImplementedError(self.set_reference)
963
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
964
    def get_format_string(self):
965
        """Return the ASCII format string that identifies this format."""
966
        raise NotImplementedError(self.get_format_string)
967
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
968
    def get_format_description(self):
969
        """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).
970
        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
971
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
972
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
973
                           set_format=True):
974
        """Initialize a branch in a bzrdir, with specified files
975
976
        :param a_bzrdir: The bzrdir to initialize the branch in
977
        :param utf8_files: The files to create as a list of
978
            (filename, content) tuples
979
        :param set_format: If True, set the format with
980
            self.get_format_string.  (BzrBranch4 has its format set
981
            elsewhere)
982
        :return: a branch in this format
983
        """
984
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
985
        branch_transport = a_bzrdir.get_branch_transport(self)
986
        lock_map = {
987
            'metadir': ('lock', lockdir.LockDir),
988
            'branch4': ('branch-lock', lockable_files.TransportLock),
989
        }
990
        lock_name, lock_class = lock_map[lock_type]
991
        control_files = lockable_files.LockableFiles(branch_transport,
992
            lock_name, lock_class)
993
        control_files.create_lock()
994
        control_files.lock_write()
995
        if set_format:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
996
            utf8_files += [('format', self.get_format_string())]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
997
        try:
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
998
            for (filename, content) in utf8_files:
999
                branch_transport.put_bytes(
1000
                    filename, content,
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1001
                    mode=a_bzrdir._get_file_mode())
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1002
        finally:
1003
            control_files.unlock()
1004
        return self.open(a_bzrdir, _found=True)
1005
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1006
    def initialize(self, a_bzrdir):
1007
        """Create a branch of this format in a_bzrdir."""
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
1008
        raise NotImplementedError(self.initialize)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1009
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.
1010
    def is_supported(self):
1011
        """Is this format supported?
1012
1013
        Supported formats can be initialized and opened.
1014
        Unsupported formats may not support initialization or committing or 
1015
        some other features depending on the reason for not being supported.
1016
        """
1017
        return True
1018
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1019
    def open(self, a_bzrdir, _found=False):
1020
        """Return the branch object for a_bzrdir
1021
1022
        _found is a private parameter, do not use it. It is used to indicate
1023
               if format probing has already be done.
1024
        """
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1025
        raise NotImplementedError(self.open)
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1026
1027
    @classmethod
1028
    def register_format(klass, format):
1029
        klass._formats[format.get_format_string()] = format
1030
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.
1031
    @classmethod
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1032
    def set_default_format(klass, format):
1033
        klass._default_format = format
1034
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1035
    def supports_stacking(self):
1036
        """True if this format records a stacked-on branch."""
1037
        return False
1038
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1039
    @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.
1040
    def unregister_format(klass, format):
1041
        del klass._formats[format.get_format_string()]
1042
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1043
    def __str__(self):
1044
        return self.get_format_string().rstrip()
1045
2220.2.10 by Martin Pool
(broken) start moving things to branches
1046
    def supports_tags(self):
1047
        """True if this format supports tags stored in the branch"""
1048
        return False  # by default
1049
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1050
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1051
class BranchHooks(Hooks):
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1052
    """A dictionary mapping hook name to a list of callables for branch hooks.
1053
    
1054
    e.g. ['set_rh'] Is the list of items to be called when the
1055
    set_revision_history function is invoked.
1056
    """
1057
1058
    def __init__(self):
1059
        """Create the default hooks.
1060
1061
        These are all empty initially, because by default nothing should get
1062
        notified.
1063
        """
2370.4.1 by Robert Collins
New SmartServer hooks facility. There are two initial hooks documented
1064
        Hooks.__init__(self)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1065
        # 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.
1066
        # invoked whenever the revision history has been set
1067
        # with set_revision_history. The api signature is
1068
        # (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
1069
        # be write-locked.
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
1070
        self['set_rh'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1071
        # invoked after a push operation completes.
1072
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
1073
        # (push_result)
1074
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1075
        # (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)
1076
        # 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
1077
        # master branch, and the rest should be self explanatory. The source
1078
        # is read locked and the target branches write locked. Source will
1079
        # be the local low-latency branch.
1080
        self['post_push'] = []
1081
        # invoked after a pull operation completes.
1082
        # the api signature is
2297.1.5 by Martin Pool
Update hook docs
1083
        # (pull_result)
1084
        # containing the members
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1085
        # (source, local, master, old_revno, old_revid, new_revno, new_revid)
1086
        # where local is the local branch or None, master is the target 
1087
        # master branch, and the rest should be self explanatory. The source
1088
        # is read locked and the target branches write locked. The local
1089
        # branch is the low-latency branch.
1090
        self['post_pull'] = []
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
1091
        # invoked before a commit operation takes place.
1092
        # the api signature is
1093
        # (local, master, old_revno, old_revid, future_revno, future_revid,
2659.3.9 by NamNguyen
branch.py:
1094
        #  tree_delta, future_tree).
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
1095
        # old_revid is NULL_REVISION for the first commit to a branch
2659.3.9 by NamNguyen
branch.py:
1096
        # tree_delta is a TreeDelta object describing changes from the basis
1097
        # revision, hooks MUST NOT modify this delta
1098
        # future_tree is an in-memory tree obtained from
1099
        # CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
1100
        self['pre_commit'] = []
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1101
        # invoked after a commit operation completes.
1102
        # the api signature is 
1103
        # (local, master, old_revno, old_revid, new_revno, new_revid)
1104
        # old_revid is NULL_REVISION for the first commit to a branch.
1105
        self['post_commit'] = []
1106
        # invoked after a uncommit operation completes.
1107
        # the api signature is
1108
        # (local, master, old_revno, old_revid, new_revno, new_revid) where
1109
        # local is the local branch or None, master is the target branch,
1110
        # and an empty branch recieves new_revno of 0, new_revid of None.
1111
        self['post_uncommit'] = []
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1112
        # Introduced in 1.6
1113
        # Invoked before the tip of a branch changes.
1114
        # the api signature is
1115
        # (params) where params is a ChangeBranchTipParams with the members
1116
        # (branch, old_revno, new_revno, old_revid, new_revid)
1117
        self['pre_change_branch_tip'] = []
3331.1.1 by James Henstridge
Add set_last_revision_info hook.
1118
        # Introduced in 1.4
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1119
        # Invoked after the tip of a branch changes.
1120
        # the api signature is
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1121
        # (params) where params is a ChangeBranchTipParams with the members
1122
        # (branch, old_revno, new_revno, old_revid, new_revid)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1123
        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.
1124
1125
1126
# install the default hooks into the Branch class.
1127
Branch.hooks = BranchHooks()
1128
1129
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1130
class ChangeBranchTipParams(object):
1131
    """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()
1132
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1133
    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()
1134
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1135
    :ivar branch: the branch being changed
1136
    :ivar old_revno: revision number before the change
1137
    :ivar new_revno: revision number after the change
1138
    :ivar old_revid: revision id before the change
1139
    :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()
1140
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1141
    The revid fields are strings. The revno fields are integers.
1142
    """
1143
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1144
    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
1145
        """Create a group of ChangeBranchTip parameters.
1146
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1147
        :param branch: The branch being changed.
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1148
        :param old_revno: Revision number before the change.
1149
        :param new_revno: Revision number after the change.
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1150
        :param old_revid: Tip revision id before the change.
1151
        :param new_revid: Tip revision id after the change.
1152
        """
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1153
        self.branch = branch
3331.1.5 by James Henstridge
Put revno before revid in method arguments to match last_revision_info()
1154
        self.old_revno = old_revno
1155
        self.new_revno = new_revno
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1156
        self.old_revid = old_revid
1157
        self.new_revid = new_revid
1158
3517.2.3 by Andrew Bennetts
Better tests for {pre,post}_change_branch_tip hooks.
1159
    def __eq__(self, other):
1160
        return self.__dict__ == other.__dict__
1161
    
1162
    def __repr__(self):
1163
        return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1164
            self.__class__.__name__, self.branch, 
1165
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1166
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1167
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1168
class BzrBranchFormat4(BranchFormat):
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
1169
    """Bzr branch format 4.
1170
1171
    This format has:
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1172
     - 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.
1173
     - a branch-lock lock file [ to be shared with the bzrdir ]
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1174
    """
1175
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
1176
    def get_format_description(self):
1177
        """See BranchFormat.get_format_description()."""
1178
        return "Branch format 4"
1179
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1180
    def initialize(self, a_bzrdir):
1181
        """Create a branch of this format in a_bzrdir."""
1182
        utf8_files = [('revision-history', ''),
1183
                      ('branch-name', ''),
1184
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1185
        return self._initialize_helper(a_bzrdir, utf8_files,
1186
                                       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.
1187
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1188
    def __init__(self):
1189
        super(BzrBranchFormat4, self).__init__()
1190
        self._matchingbzrdir = bzrdir.BzrDirFormat6()
1191
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1192
    def open(self, a_bzrdir, _found=False):
1193
        """Return the branch object for a_bzrdir
1194
1195
        _found is a private parameter, do not use it. It is used to indicate
1196
               if format probing has already be done.
1197
        """
1198
        if not _found:
1199
            # we are being called directly and must probe.
1200
            raise NotImplementedError
1201
        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.
1202
                         _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.
1203
                         a_bzrdir=a_bzrdir,
1204
                         _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.
1205
1553.4.8 by Michael Ellerman
Define __str__ for BranchFormat, just return the format string with the
1206
    def __str__(self):
1207
        return "Bazaar-NG branch format 4"
1208
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1209
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1210
class BranchFormatMetadir(BranchFormat):
1211
    """Common logic for meta-dir based branch formats."""
1212
1213
    def _branch_class(self):
1214
        """What class to instantiate on open calls."""
1215
        raise NotImplementedError(self._branch_class)
1216
1217
    def open(self, a_bzrdir, _found=False):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
1218
        """Return the branch object for a_bzrdir.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1219
1220
        _found is a private parameter, do not use it. It is used to indicate
1221
               if format probing has already be done.
1222
        """
1223
        if not _found:
1224
            format = BranchFormat.find_format(a_bzrdir)
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
1225
            if format.__class__ != self.__class__:
1226
                raise AssertionError("wrong format %r found for %r" %
1227
                    (format, self))
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1228
        try:
1229
            transport = a_bzrdir.get_branch_transport(None)
1230
            control_files = lockable_files.LockableFiles(transport, 'lock',
1231
                                                         lockdir.LockDir)
1232
            return self._branch_class()(_format=self,
1233
                              _control_files=control_files,
1234
                              a_bzrdir=a_bzrdir,
1235
                              _repository=a_bzrdir.find_repository())
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
1236
        except errors.NoSuchFile:
1237
            raise errors.NotBranchError(path=transport.base)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1238
1239
    def __init__(self):
1240
        super(BranchFormatMetadir, self).__init__()
1241
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1242
1243
    def supports_tags(self):
1244
        return True
1245
1246
1247
class BzrBranchFormat5(BranchFormatMetadir):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1248
    """Bzr branch format 5.
1249
1250
    This format has:
1251
     - a revision-history file.
1252
     - a format string
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1253
     - a lock dir guarding the branch itself
1254
     - 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.
1255
     - works with shared repositories.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
1256
1257
    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.
1258
    """
1259
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1260
    def _branch_class(self):
1261
        return BzrBranch5
1262
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
1263
    def get_format_string(self):
1264
        """See BranchFormat.get_format_string()."""
1265
        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
1266
1267
    def get_format_description(self):
1268
        """See BranchFormat.get_format_description()."""
1269
        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.
1270
        
1271
    def initialize(self, a_bzrdir):
1272
        """Create a branch of this format in a_bzrdir."""
1273
        utf8_files = [('revision-history', ''),
1274
                      ('branch-name', ''),
1275
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1276
        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.
1277
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1278
    def supports_tags(self):
1279
        return False
1280
1281
1282
class BzrBranchFormat6(BranchFormatMetadir):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1283
    """Branch format with last-revision and tags.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1284
2230.3.38 by Aaron Bentley
Update docs per Martin's suggestion
1285
    Unlike previous formats, this has no explicit revision history. Instead,
1286
    this just stores the last-revision, and the left-hand history leading
1287
    up to there is the history.
1288
1289
    This format was introduced in bzr 0.15
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1290
    and became the default in 0.91.
2230.3.1 by Aaron Bentley
Get branch6 creation working
1291
    """
1292
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1293
    def _branch_class(self):
1294
        return BzrBranch6
1295
2230.3.1 by Aaron Bentley
Get branch6 creation working
1296
    def get_format_string(self):
1297
        """See BranchFormat.get_format_string()."""
2255.2.230 by Robert Collins
Update tree format signatures to mention introducing bzr version.
1298
        return "Bazaar Branch Format 6 (bzr 0.15)\n"
2230.3.1 by Aaron Bentley
Get branch6 creation working
1299
1300
    def get_format_description(self):
1301
        """See BranchFormat.get_format_description()."""
1302
        return "Branch format 6"
1303
1304
    def initialize(self, a_bzrdir):
1305
        """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
1306
        utf8_files = [('last-revision', '0 null:\n'),
2220.2.28 by Martin Pool
Integrate tags with Branch6:
1307
                      ('branch.conf', ''),
1308
                      ('tags', ''),
2230.3.1 by Aaron Bentley
Get branch6 creation working
1309
                      ]
2230.3.37 by Aaron Bentley
Refactor BranchFormat._initialize_helper out of BzrBranchFormat[4-6]
1310
        return self._initialize_helper(a_bzrdir, utf8_files)
2230.3.1 by Aaron Bentley
Get branch6 creation working
1311
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1312
1313
class BzrBranchFormat7(BranchFormatMetadir):
1314
    """Branch format with last-revision, tags, and a stacked location pointer.
1315
1316
    The stacked location pointer is passed down to the repository and requires
1317
    a repository format with supports_external_lookups = True.
1318
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
1319
    This format was introduced in bzr 1.6.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1320
    """
1321
1322
    def _branch_class(self):
1323
        return BzrBranch7
1324
1325
    def get_format_string(self):
1326
        """See BranchFormat.get_format_string()."""
3221.13.6 by Ian Clatworthy
update BzrBranch7 format to say 1.6, not 1.3
1327
        return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1328
1329
    def get_format_description(self):
1330
        """See BranchFormat.get_format_description()."""
1331
        return "Branch format 7"
1332
1333
    def initialize(self, a_bzrdir):
1334
        """Create a branch of this format in a_bzrdir."""
1335
        utf8_files = [('last-revision', '0 null:\n'),
1336
                      ('branch.conf', ''),
1337
                      ('tags', ''),
1338
                      ]
1339
        return self._initialize_helper(a_bzrdir, utf8_files)
2220.2.27 by Martin Pool
Start adding tags to Branch6
1340
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1341
    def __init__(self):
3221.11.7 by Robert Collins
Merge in real stacked repository work.
1342
        super(BzrBranchFormat7, self).__init__()
3221.12.1 by Robert Collins
Backport development1 format (stackable packs) to before-shallow-branches.
1343
        self._matchingbzrdir.repository_format = \
1344
            RepositoryFormatPackDevelopment1Subtree()
1345
3575.2.2 by Martin Pool
branch --stacked should force a stacked format
1346
    def supports_stacking(self):
1347
        return True
1348
2230.3.1 by Aaron Bentley
Get branch6 creation working
1349
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.
1350
class BranchReferenceFormat(BranchFormat):
1351
    """Bzr branch reference format.
1352
1353
    Branch references are used in implementing checkouts, they
1354
    act as an alias to the real branch which is at some other url.
1355
1356
    This format has:
1357
     - A location file
1358
     - a format string
1359
    """
1360
1361
    def get_format_string(self):
1362
        """See BranchFormat.get_format_string()."""
1363
        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
1364
1365
    def get_format_description(self):
1366
        """See BranchFormat.get_format_description()."""
1367
        return "Checkout reference format 1"
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1368
2414.2.1 by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch.
1369
    def get_reference(self, a_bzrdir):
1370
        """See BranchFormat.get_reference()."""
1371
        transport = a_bzrdir.get_branch_transport(None)
1372
        return transport.get('location').read()
1373
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
1374
    def set_reference(self, a_bzrdir, to_branch):
1375
        """See BranchFormat.set_reference()."""
1376
        transport = a_bzrdir.get_branch_transport(None)
1377
        location = transport.put_bytes('location', to_branch.base)
1378
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.
1379
    def initialize(self, a_bzrdir, target_branch=None):
1380
        """Create a branch of this format in a_bzrdir."""
1381
        if target_branch is None:
1382
            # this format does not implement branch itself, thus the implicit
1383
            # creation contract must see it as uninitializable
1384
            raise errors.UninitializableFormat(self)
1385
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
1386
        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
1387
        branch_transport.put_bytes('location',
1955.3.25 by John Arbash Meinel
apply a FIXME
1388
            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
1389
        branch_transport.put_bytes('format', self.get_format_string())
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1390
        return self.open(
1391
            a_bzrdir, _found=True,
1392
            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.
1393
1394
    def __init__(self):
1395
        super(BranchReferenceFormat, self).__init__()
1396
        self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1397
1398
    def _make_reference_clone_function(format, a_branch):
1399
        """Create a clone() routine for a branch dynamically."""
1400
        def clone(to_bzrdir, revision_id=None):
1401
            """See Branch.clone()."""
1402
            return format.initialize(to_bzrdir, a_branch)
1403
            # cannot obey revision_id limits when cloning a reference ...
1404
            # FIXME RBC 20060210 either nuke revision_id for clone, or
1405
            # emit some sort of warning/error to the caller ?!
1406
        return clone
1407
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1408
    def open(self, a_bzrdir, _found=False, location=None,
1409
             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.
1410
        """Return the branch that the branch reference in a_bzrdir points at.
1411
1412
        _found is a private parameter, do not use it. It is used to indicate
1413
               if format probing has already be done.
1414
        """
1415
        if not _found:
1416
            format = BranchFormat.find_format(a_bzrdir)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1417
            if format.__class__ != self.__class__:
1418
                raise AssertionError("wrong format %r found for %r" %
1419
                    (format, self))
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
1420
        if location is None:
1421
            location = self.get_reference(a_bzrdir)
2955.5.2 by Vincent Ladeuil
Fix first unwanted connection.
1422
        real_bzrdir = bzrdir.BzrDir.open(
1423
            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.
1424
        result = real_bzrdir.open_branch()
1425
        # this changes the behaviour of result.clone to create a new reference
1426
        # rather than a copy of the content of the branch.
1427
        # I did not use a proxy object because that needs much more extensive
1428
        # testing, and we are only changing one behaviour at the moment.
1429
        # If we decide to alter more behaviours - i.e. the implicit nickname
1430
        # then this should be refactored to introduce a tested proxy branch
1431
        # and a subclass of that for use in overriding clone() and ....
1432
        # - RBC 20060210
1433
        result.clone = self._make_reference_clone_function(result)
1434
        return result
1435
1436
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1437
# formats which have no format string are not discoverable
1438
# and not independently creatable, so are not registered.
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1439
__format5 = BzrBranchFormat5()
1440
__format6 = BzrBranchFormat6()
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1441
__format7 = BzrBranchFormat7()
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1442
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.
1443
BranchFormat.register_format(BranchReferenceFormat())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1444
BranchFormat.register_format(__format6)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1445
BranchFormat.register_format(__format7)
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
1446
BranchFormat.set_default_format(__format6)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1447
_legacy_formats = [BzrBranchFormat4(),
1448
                   ]
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
1449
1495.1.5 by Jelmer Vernooij
Rename NativeBranch -> BzrBranch
1450
class BzrBranch(Branch):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1451
    """A branch stored in the actual filesystem.
1452
1453
    Note that it's "local" in the context of the filesystem; it doesn't
1454
    really matter if it's on an nfs/smb/afs/coda/... share, as long as
1455
    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
1456
1457
    :ivar _transport: Transport for file operations on this branch's 
1458
        control files, typically pointing to the .bzr/branch directory.
1459
    :ivar repository: Repository for this branch.
1460
    :ivar base: The url of the base directory for this branch; the one 
1461
        containing the .bzr directory.
1 by mbp at sourcefrog
import from baz patch-364
1462
    """
353 by Martin Pool
- Per-branch locks in read and write modes.
1463
    
2367.2.1 by Robert Collins
Remove bzrlib 0.8 compatability where it was making the code unclear or messy. (Robert Collins)
1464
    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.
1465
                 _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)
1466
        """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.
1467
        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)
1468
            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.
1469
        else:
1470
            self.bzrdir = a_bzrdir
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1471
        self._base = self.bzrdir.transport.clone('..').base
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1472
        # XXX: We should be able to just do
1473
        #   self.base = self.bzrdir.root_transport.base
1474
        # but this does not quite work yet -- mbp 20080522
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
1475
        self._format = _format
1534.4.28 by Robert Collins
first cut at merge from integration.
1476
        if _control_files is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1477
            raise ValueError('BzrBranch _control_files is None')
1534.4.28 by Robert Collins
first cut at merge from integration.
1478
        self.control_files = _control_files
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1479
        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.
1480
        self.repository = _repository
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
1481
        Branch.__init__(self)
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1482
1 by mbp at sourcefrog
import from baz patch-364
1483
    def __str__(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1484
        return '%s(%r)' % (self.__class__.__name__, self.base)
1 by mbp at sourcefrog
import from baz patch-364
1485
1486
    __repr__ = __str__
1487
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1488
    def _get_base(self):
2220.2.16 by mbp at sourcefrog
Make Branch._transport be the branch's control file transport
1489
        """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
1490
        return self._base
907.1.17 by John Arbash Meinel
Adding a Branch.base property, removing pull_loc()
1491
1442.1.5 by Robert Collins
Give branch.base a docstring.
1492
    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,
1493
1694.2.6 by Martin Pool
[merge] bzr.dev
1494
    def is_locked(self):
1495
        return self.control_files.is_locked()
1496
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
    def lock_write(self, token=None):
1498
        repo_token = self.repository.lock_write()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1499
        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).
1500
            token = self.control_files.lock_write(token=token)
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1501
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1502
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1503
            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).
1504
        return token
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1505
1185.65.3 by Aaron Bentley
Fixed locking-- all tests pass
1506
    def lock_read(self):
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1507
        self.repository.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1508
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1509
            self.control_files.lock_read()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1510
        except:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1511
            self.repository.unlock()
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
1512
            raise
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
1513
1514
    def unlock(self):
1185.65.11 by Robert Collins
Disable inheritance for getting at LockableFiles, rather use composition.
1515
        # TODO: test for failed two phase locks. This is known broken.
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1516
        try:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1517
            self.control_files.unlock()
1687.1.8 by Robert Collins
Teach Branch about break_lock.
1518
        finally:
1711.8.3 by John Arbash Meinel
Branch should lock Repository before it locks self, and unlock self before Repository
1519
            self.repository.unlock()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1520
        if not self.control_files.is_locked():
1521
            # we just released the lock
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
1522
            self._clear_cached_state()
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1523
        
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1524
    def peek_lock_mode(self):
1525
        if self.control_files._lock_count == 0:
1526
            return None
1527
        else:
1528
            return self.control_files._lock_mode
1529
1694.2.6 by Martin Pool
[merge] bzr.dev
1530
    def get_physical_lock_status(self):
1531
        return self.control_files.get_physical_lock_status()
1532
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1533
    @needs_read_lock
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1534
    def print_file(self, file, revision_id):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1535
        """See Branch.print_file."""
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1536
        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.
1537
2230.3.49 by Aaron Bentley
Fix cache updating
1538
    def _write_revision_history(self, history):
1539
        """Factored out of set_revision_history.
1540
1541
        This performs the actual writing to disk.
1542
        It is intended to be called by BzrBranch5.set_revision_history."""
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
1543
        self._transport.put_bytes(
1544
            'revision-history', '\n'.join(history),
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
1545
            mode=self.bzrdir._get_file_mode())
2230.3.49 by Aaron Bentley
Fix cache updating
1546
1442.1.68 by Robert Collins
'bzr pull' now accepts '--clobber'.
1547
    @needs_write_lock
1548
    def set_revision_history(self, rev_history):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1549
        """See Branch.set_revision_history."""
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1550
        if 'evil' in debug.debug_flags:
1551
            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.
1552
        check_not_reserved_id = _mod_revision.check_not_reserved_id
1553
        for rev_id in rev_history:
1554
            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().
1555
        if Branch.hooks['post_change_branch_tip']:
1556
            # Don't calculate the last_revision_info() if there are no hooks
1557
            # that will use it.
1558
            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.
1559
        if len(rev_history) == 0:
1560
            revid = _mod_revision.NULL_REVISION
1561
        else:
1562
            revid = rev_history[-1]
1563
        self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2230.3.49 by Aaron Bentley
Fix cache updating
1564
        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.
1565
        self._clear_cached_state()
2375.1.3 by Andrew Bennetts
Don't use Branch.get_transaction to cache revision history.
1566
        self._cache_revision_history(rev_history)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
1567
        for hook in Branch.hooks['set_rh']:
1568
            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().
1569
        if Branch.hooks['post_change_branch_tip']:
1570
            self._run_post_change_branch_tip_hooks(old_revno, old_revid)
233 by mbp at sourcefrog
- more output from test.sh
1571
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1572
    def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1573
        """Run the pre_change_branch_tip hooks."""
1574
        hooks = Branch.hooks['pre_change_branch_tip']
1575
        if not hooks:
1576
            return
1577
        old_revno, old_revid = self.last_revision_info()
1578
        params = ChangeBranchTipParams(
1579
            self, old_revno, new_revno, old_revid, new_revid)
1580
        for hook in hooks:
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
1581
            try:
1582
                hook(params)
1583
            except errors.TipChangeRejected:
1584
                raise
1585
            except Exception:
1586
                exc_info = sys.exc_info()
1587
                hook_name = Branch.hooks.get_hook_name(hook)
1588
                raise errors.HookFailed(
1589
                    'pre_change_branch_tip', hook_name, exc_info)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
1590
 
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1591
    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
1592
        """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.
1593
        hooks = Branch.hooks['post_change_branch_tip']
1594
        if not hooks:
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1595
            return
3331.1.13 by James Henstridge
Use last_revision_info() to retrieve the new revision number and ID.
1596
        new_revno, new_revid = self.last_revision_info()
1597
        params = ChangeBranchTipParams(
1598
            self, old_revno, new_revno, old_revid, new_revid)
1599
        for hook in hooks:
3331.1.7 by James Henstridge
Make the branch a member of the ChangeBranchTipParams object.
1600
            hook(params)
3323.2.1 by Ian Clatworthy
first cut at post_change_branch_tip hook
1601
 
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1602
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1603
    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
1604
        """Set the last revision of this branch.
1605
1606
        The caller is responsible for checking that the revno is correct
1607
        for this revision id.
1608
1609
        It may be possible to set the branch last revision to an id not
1610
        present in the repository.  However, branches can also be 
1611
        configured to check constraints on history, in which case this may not
1612
        be permitted.
1613
        """
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
1614
        revision_id = _mod_revision.ensure_null(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1615
        # this old format stores the full history, but this api doesn't
1616
        # provide it, so we must generate, and might as well check it's
1617
        # correct
2697.2.5 by Martin Pool
Kill off append_revision
1618
        history = self._lefthand_history(revision_id)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1619
        if len(history) != revno:
1620
            raise AssertionError('%d != %d' % (len(history), revno))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
1621
        self.set_revision_history(history)
2230.3.5 by Aaron Bentley
implement set_last revision and clone
1622
2230.4.1 by Aaron Bentley
Get log as fast branch5
1623
    def _gen_revision_history(self):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
1624
        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.
1625
        if history[-1:] == ['']:
1626
            # There shouldn't be a trailing newline, but just in case.
1627
            history.pop()
2230.4.1 by Aaron Bentley
Get log as fast branch5
1628
        return history
1629
2230.3.2 by Aaron Bentley
Get all branch tests passing
1630
    def _lefthand_history(self, revision_id, last_rev=None,
1631
                          other_branch=None):
2592.3.113 by Robert Collins
Various -Devil checks in branch.py.
1632
        if 'evil' in debug.debug_flags:
1633
            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.
1634
        # stop_revision must be a descendant of last_revision
3240.1.3 by Aaron Bentley
Use Graph to generate revision_history
1635
        graph = self.repository.get_graph()
1636
        if last_rev is not None:
1637
            if not graph.is_ancestor(last_rev, revision_id):
1638
                # our previous tip is not merged into stop_revision
1639
                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.
1640
        # make a new revision history from the graph
3240.1.4 by Aaron Bentley
Simplify _lefthand_history code
1641
        parents_map = graph.get_parent_map([revision_id])
1642
        if revision_id not in parents_map:
1643
            raise errors.NoSuchRevision(self, revision_id)
1644
        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.
1645
        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.
1646
        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
1647
        # Do not include ghosts or graph origin in revision_history
1648
        while (current_rev_id in parents_map and
1649
               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.
1650
            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.
1651
            new_history.append(current_rev_id)
3240.1.5 by Aaron Bentley
Further clean-ups, move None conversion out into API functions
1652
            current_rev_id = parents_map[current_rev_id][0]
3240.1.4 by Aaron Bentley
Simplify _lefthand_history code
1653
            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.
1654
        new_history.reverse()
2230.3.2 by Aaron Bentley
Get all branch tests passing
1655
        return new_history
1656
1657
    @needs_write_lock
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1658
    def generate_revision_history(self, revision_id, last_rev=None,
2230.3.2 by Aaron Bentley
Get all branch tests passing
1659
        other_branch=None):
1660
        """Create a new revision history that will finish with revision_id.
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
1661
2230.3.2 by Aaron Bentley
Get all branch tests passing
1662
        :param revision_id: the new tip to use.
1663
        :param last_rev: The previous last_revision. If not None, then this
1664
            must be a ancestory of revision_id, or DivergedBranches is raised.
1665
        :param other_branch: The other branch that DivergedBranches should
1666
            raise with respect to.
1667
        """
1668
        self.set_revision_history(self._lefthand_history(revision_id,
1669
            last_rev, other_branch))
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
1670
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1671
    def basis_tree(self):
1672
        """See Branch.basis_tree."""
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1673
        return self.repository.revision_tree(self.last_revision())
1185.33.59 by Martin Pool
[patch] keep a cached basis inventory (Johan Rydberg)
1674
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1675
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1676
    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.
1677
             _hook_master=None, run_hooks=True, possible_transports=None,
1678
             _override_hook_target=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1679
        """See Branch.pull.
1680
1681
        :param _hook_master: Private parameter - set the branch to 
3489.2.7 by Andrew Bennetts
Update comments and docstrings, add NEWS entry.
1682
            be supplied as the master to pull hooks.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1683
        :param run_hooks: Private parameter - if false, this branch
1684
            is being called because it's the master of the primary branch,
1685
            so it should not run its hooks.
3489.2.7 by Andrew Bennetts
Update comments and docstrings, add NEWS entry.
1686
        :param _override_hook_target: Private parameter - set the branch to be
1687
            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
1688
        """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1689
        result = PullResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1690
        result.source_branch = source
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1691
        if _override_hook_target is None:
1692
            result.target_branch = self
1693
        else:
1694
            result.target_branch = _override_hook_target
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1695
        source.lock_read()
1696
        try:
3445.1.6 by John Arbash Meinel
Start using the 'graph' parameter of update_revisions to bias push and pull checking
1697
            # We assume that during 'pull' the local repository is closer than
1698
            # the remote one.
1699
            graph = self.repository.get_graph(source.repository)
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1700
            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
1701
            self.update_revisions(source, stop_revision, overwrite=overwrite,
1702
                                  graph=graph)
2804.3.1 by Lukáš Lalinský
Overwrite conflicting tags by push|pull --overwrite.
1703
            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.
1704
            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.
1705
            if _hook_master:
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1706
                result.master_branch = _hook_master
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1707
                result.local_branch = result.target_branch
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1708
            else:
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1709
                result.master_branch = result.target_branch
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1710
                result.local_branch = None
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1711
            if run_hooks:
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1712
                for hook in Branch.hooks['post_pull']:
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1713
                    hook(result)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1714
        finally:
1715
            source.unlock()
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
1716
        return result
1 by mbp at sourcefrog
import from baz patch-364
1717
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1718
    def _get_parent_location(self):
1719
        _locs = ['parent', 'pull', 'x-pull']
1720
        for l in _locs:
1721
            try:
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
1722
                return self._transport.get_bytes(l).strip('\n')
3236.1.2 by Michael Hudson
clean up branch.py imports
1723
            except errors.NoSuchFile:
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1724
                pass
1725
        return None
1726
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1727
    @needs_read_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1728
    def push(self, target, overwrite=False, stop_revision=None,
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1729
             _override_hook_source_branch=None):
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1730
        """See Branch.push.
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1731
1732
        This is the basic concrete implementation of push()
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1733
1734
        :param _override_hook_source_branch: If specified, run
1735
        the hooks passing this Branch as the source, rather than self.  
1736
        This is for use of RemoteBranch, where push is delegated to the
1737
        underlying vfs-based Branch. 
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1738
        """
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1739
        # TODO: Public option to disable running hooks - should be trivial but
1740
        # needs tests.
1741
        target.lock_write()
1742
        try:
1743
            result = self._push_with_bound_branches(target, overwrite,
1744
                    stop_revision,
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1745
                    _override_hook_source_branch=_override_hook_source_branch)
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1746
            return result
1747
        finally:
1748
            target.unlock()
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1749
1750
    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
1751
            stop_revision,
1752
            _override_hook_source_branch=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1753
        """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)
1754
        
1755
        This is on the base BzrBranch class even though it doesn't support 
1756
        bound branches because the *target* might be bound.
1757
        """
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1758
        def _run_hooks():
1759
            if _override_hook_source_branch:
1760
                result.source_branch = _override_hook_source_branch
1761
            for hook in Branch.hooks['post_push']:
1762
                hook(result)
1763
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1764
        bound_location = target.get_bound_location()
1765
        if bound_location and target.base != bound_location:
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1766
            # there is a master branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1767
            #
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1768
            # XXX: Why the second check?  Is it even supported for a branch to
1769
            # be bound to itself? -- mbp 20070507
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1770
            master_branch = target.get_master_branch()
1771
            master_branch.lock_write()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1772
            try:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1773
                # push into the master from this branch.
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1774
                self._basic_push(master_branch, overwrite, stop_revision)
1775
                # and push into the target branch from this. Note that we push from
1776
                # this branch again, because its considered the highest bandwidth
1777
                # repository.
1778
                result = self._basic_push(target, overwrite, stop_revision)
1779
                result.master_branch = master_branch
1780
                result.local_branch = target
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1781
                _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1782
                return result
1783
            finally:
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1784
                master_branch.unlock()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1785
        else:
1786
            # no master branch
1787
            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
1788
            # TODO: Why set master_branch and local_branch if there's no
1789
            # binding?  Maybe cleaner to just leave them unset? -- mbp
1790
            # 20070504
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1791
            result.master_branch = target
1792
            result.local_branch = None
2477.1.5 by Martin Pool
More cleanups of Branch.push to get the right behaviour with RemoteBranches
1793
            _run_hooks()
2477.1.3 by Martin Pool
More refactoring of Branch.push into smaller bits
1794
            return result
1795
1796
    def _basic_push(self, target, overwrite, stop_revision):
1797
        """Basic implementation of push without bound branches or hooks.
1798
1799
        Must be called with self read locked and target write locked.
1800
        """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
1801
        result = PushResult()
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
1802
        result.source_branch = self
1803
        result.target_branch = target
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
1804
        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
1805
3445.1.8 by John Arbash Meinel
Clarity tweaks recommended by Ian
1806
        # We assume that during 'push' this repository is closer than
1807
        # the target.
3445.1.6 by John Arbash Meinel
Start using the 'graph' parameter of update_revisions to bias push and pull checking
1808
        graph = self.repository.get_graph(target.repository)
1809
        target.update_revisions(self, stop_revision, overwrite=overwrite,
1810
                                graph=graph)
3441.5.13 by Andrew Bennetts
Remove unnecessary extra lock_write in _basic_push.
1811
        result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1812
        result.new_revno, result.new_revid = target.last_revision_info()
1813
        return result
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1814
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1815
    def get_parent(self):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1816
        """See Branch.get_parent."""
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1817
        parent = self._get_parent_location()
1818
        if parent is None:
1819
            return parent
1820
        # This is an old-format absolute path to a local branch
1821
        # turn it into a url
1822
        if parent.startswith('/'):
1823
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1824
        try:
1825
            return urlutils.join(self.base[:-1], parent)
1826
        except errors.InvalidURLJoin, e:
1827
            raise errors.InaccessibleParent(parent, self.base)
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1828
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
1829
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1830
        raise errors.UnstackableBranchFormat(self._format, self.base)
1831
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1832
    def set_push_location(self, location):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1833
        """See Branch.set_push_location."""
2120.6.4 by James Henstridge
add support for specifying policy when storing options
1834
        self.get_config().set_user_option(
2120.6.9 by James Henstridge
Fixes for issues brought up in John's review
1835
            'push_location', location,
1836
            store=_mod_config.STORE_LOCATION_NORECURSE)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1837
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1838
    @needs_write_lock
1150 by Martin Pool
- add new Branch.set_parent and tests
1839
    def set_parent(self, url):
1495.1.2 by Jelmer Vernooij
Move some generic methods of NativeBranch to Branch.
1840
        """See Branch.set_parent."""
1150 by Martin Pool
- add new Branch.set_parent and tests
1841
        # TODO: Maybe delete old location files?
1185.65.29 by Robert Collins
Implement final review suggestions.
1842
        # URLs should never be unicode, even on the local fs,
1843
        # 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
1844
        # read and rewrite the file. RBC 20060125
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1845
        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
1846
            if isinstance(url, unicode):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1847
                try:
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
1848
                    url = url.encode('ascii')
1849
                except UnicodeEncodeError:
2418.5.5 by John Arbash Meinel
Add some tests and an api for revision_id_to_dotted_revno
1850
                    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
1851
                        "Urls must be 7-bit ascii, "
1852
                        "use bzrlib.urlutils.escape")
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
1853
            url = urlutils.relative_url(self.base, url)
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1854
        self._set_parent_location(url)
1855
1856
    def _set_parent_location(self, url):
1857
        if url is None:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1858
            self._transport.delete('parent')
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
1859
        else:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1860
            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
1861
                mode=self.bzrdir._get_file_mode())
1150 by Martin Pool
- add new Branch.set_parent and tests
1862
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
1863
    def set_stacked_on_url(self, url):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1864
        raise errors.UnstackableBranchFormat(self._format, self.base)
1865
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1866
1867
class BzrBranch5(BzrBranch):
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1868
    """A format 5 branch. This supports new features over plain branches.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1869
1870
    It has support for a master_branch which is the data for bound branches.
1871
    """
1872
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
1873
    @needs_write_lock
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1874
    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.
1875
             run_hooks=True, possible_transports=None,
1876
             _override_hook_target=None):
2477.1.9 by Martin Pool
Review cleanups from John, mostly docs
1877
        """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
1878
        
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1879
        :param run_hooks: Private parameter - if false, this branch
1880
            is being called because it's the master of the primary branch,
1881
            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
1882
        """
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1883
        bound_location = self.get_bound_location()
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1884
        master_branch = None
1885
        if bound_location and source.base != bound_location:
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1886
            # not pulling from master, so we need to update master.
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1887
            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
1888
            master_branch.lock_write()
1889
        try:
1890
            if master_branch:
1891
                # pull from source into master.
1892
                master_branch.pull(source, overwrite, stop_revision,
2477.1.2 by Martin Pool
Rename push/pull back to 'run_hooks' (jameinel)
1893
                    run_hooks=False)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1894
            return super(BzrBranch5, self).pull(source, overwrite,
1895
                stop_revision, _hook_master=master_branch,
3489.2.4 by Andrew Bennetts
Fix all tests broken by fixing make_branch_and_tree.
1896
                run_hooks=run_hooks,
1897
                _override_hook_target=_override_hook_target)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
1898
        finally:
1899
            if master_branch:
1900
                master_branch.unlock()
2245.2.1 by Robert Collins
Split branch pushing out of branch pulling.
1901
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1902
    def get_bound_location(self):
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1903
        try:
3388.2.1 by Martin Pool
Deprecate LockableFiles.get_utf8
1904
            return self._transport.get_bytes('bound')[:-1]
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1905
        except errors.NoSuchFile:
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1906
            return None
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1907
1908
    @needs_read_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1909
    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
1910
        """Return the branch we are bound to.
1911
        
1912
        :return: Either a Branch, or None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1913
1759.2.2 by Jelmer Vernooij
Revert some of my spelling fixes and fix some typos after review by Aaron.
1914
        This could memoise the branch, but if thats done
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1915
        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.
1916
        So for now we just don't memoise it.
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1917
        # 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
1918
        """
1919
        bound_loc = self.get_bound_location()
1920
        if not bound_loc:
1921
            return None
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1922
        try:
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1923
            return Branch.open(bound_loc,
1924
                               possible_transports=possible_transports)
1587.1.6 by Robert Collins
Update bound branch implementation to 0.8.
1925
        except (errors.NotBranchError, errors.ConnectionError), e:
1926
            raise errors.BoundBranchConnectionFailure(
1927
                    self, bound_loc, e)
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1928
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1929
    @needs_write_lock
1930
    def set_bound_location(self, location):
1505.1.27 by John Arbash Meinel
Adding tests against an sftp branch.
1931
        """Set the target where this branch is bound to.
1932
1933
        :param location: URL to the target branch
1934
        """
1505.1.25 by John Arbash Meinel
Updated pull. Now all paths which call set_revision_history maintain the branch invariant. All tests pass.
1935
        if location:
3446.1.1 by Martin Pool
merge further LockableFile deprecations
1936
            self._transport.put_bytes('bound', location+'\n',
1937
                mode=self.bzrdir._get_file_mode())
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1938
        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.
1939
            try:
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
1940
                self._transport.delete('bound')
3236.1.2 by Michael Hudson
clean up branch.py imports
1941
            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.
1942
                return False
1943
            return True
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1944
1945
    @needs_write_lock
1946
    def bind(self, other):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1947
        """Bind this branch to the branch other.
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1948
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1949
        This does not push or pull data between the branches, though it does
1950
        check for divergence to raise an error when the branches are not
1951
        either the same, or one a prefix of the other. That behaviour may not
1952
        be useful, so that check may be removed in future.
1953
        
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1954
        :param other: The branch to bind to
1955
        :type other: Branch
1185.64.2 by Goffredo Baroncelli
- implemented some suggestion by Robert Collins
1956
        """
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1957
        # TODO: jam 20051230 Consider checking if the target is bound
1958
        #       It is debatable whether you should be able to bind to
1959
        #       a branch which is itself bound.
1960
        #       Committing is obviously forbidden,
1961
        #       but binding itself may not be.
1962
        #       Since we *have* to check at commit time, we don't
1963
        #       *need* to check here
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
1964
1965
        # we want to raise diverged if:
1966
        # last_rev is not in the other_last_rev history, AND
1967
        # other_last_rev is not in our history, and do it without pulling
1968
        # history around
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
1969
        self.set_bound_location(other.base)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
1970
1505.1.5 by John Arbash Meinel
Added a test for the unbind command.
1971
    @needs_write_lock
1972
    def unbind(self):
1973
        """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.
1974
        return self.set_bound_location(None)
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
1975
1587.1.10 by Robert Collins
update updates working tree and branch together.
1976
    @needs_write_lock
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1977
    def update(self, possible_transports=None):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1978
        """Synchronise this branch with the master branch if any. 
1979
1980
        :return: None or the last_revision that was pivoted out during the
1981
                 update.
1982
        """
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1983
        master = self.get_master_branch(possible_transports)
1587.1.10 by Robert Collins
update updates working tree and branch together.
1984
        if master is not None:
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
1985
            old_tip = _mod_revision.ensure_null(self.last_revision())
1587.1.10 by Robert Collins
update updates working tree and branch together.
1986
            self.pull(master, overwrite=True)
2653.2.4 by Aaron Bentley
Remove get_ancestry usage from branch
1987
            if self.repository.get_graph().is_ancestor(old_tip,
1988
                _mod_revision.ensure_null(self.last_revision())):
1587.1.10 by Robert Collins
update updates working tree and branch together.
1989
                return None
1990
            return old_tip
1991
        return None
1992
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
1993
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1994
class BzrBranch7(BzrBranch5):
3517.4.7 by Martin Pool
doc
1995
    """A branch with support for a fallback repository."""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
1996
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
    def _get_fallback_repository(self, url):
1998
        """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.
1999
        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.
2000
        return bzrdir.BzrDir.open(url).open_branch().repository
2001
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2002
    def _activate_fallback_location(self, url):
2003
        """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.
2004
        self.repository.add_fallback_repository(
2005
            self._get_fallback_repository(url))
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2006
2007
    def _open_hook(self):
2008
        try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2009
            url = self.get_stacked_on_url()
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2010
        except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2011
            errors.UnstackableBranchFormat):
2012
            pass
2013
        else:
2014
            self._activate_fallback_location(url)
2015
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2016
    def _check_stackable_repo(self):
2017
        if not self.repository._format.supports_external_lookups:
2018
            raise errors.UnstackableRepositoryFormat(self.repository._format,
2019
                self.repository.base)
2230.3.2 by Aaron Bentley
Get all branch tests passing
2020
3298.2.2 by John Arbash Meinel
some small cleanups.
2021
    def __init__(self, *args, **kwargs):
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2022
        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.
2023
        self._last_revision_info_cache = None
3298.2.10 by Aaron Bentley
Refactor partial history code
2024
        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.
2025
2026
    def _clear_cached_state(self):
3221.13.3 by Ian Clatworthy
Merge bzr.dev r3466
2027
        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.
2028
        self._last_revision_info_cache = None
3298.2.10 by Aaron Bentley
Refactor partial history code
2029
        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.
2030
3298.2.10 by Aaron Bentley
Refactor partial history code
2031
    def _last_revision_info(self):
3407.2.3 by Martin Pool
Branch and Repository use their own ._transport rather than going through .control_files
2032
        revision_string = self._transport.get_bytes('last-revision')
3298.2.10 by Aaron Bentley
Refactor partial history code
2033
        revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2034
        revision_id = cache_utf8.get_cached_utf8(revision_id)
2035
        revno = int(revno)
2036
        return revno, revision_id
2037
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2038
    def _write_last_revision_info(self, revno, revision_id):
2230.3.49 by Aaron Bentley
Fix cache updating
2039
        """Simply write out the revision id, with no checks.
2040
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2041
        Use set_last_revision_info to perform this safely.
2230.3.49 by Aaron Bentley
Fix cache updating
2042
2043
        Does not update the revision_history cache.
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2044
        Intended to be called by set_last_revision_info and
2045
        _write_revision_history.
2230.3.49 by Aaron Bentley
Fix cache updating
2046
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
2047
        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
2048
        out_string = '%d %s\n' % (revno, revision_id)
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
2049
        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
2050
            mode=self.bzrdir._get_file_mode())
2230.3.2 by Aaron Bentley
Get all branch tests passing
2051
2230.3.49 by Aaron Bentley
Fix cache updating
2052
    @needs_write_lock
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2053
    def set_last_revision_info(self, revno, revision_id):
3331.1.9 by James Henstridge
Call _make_branch_tip_hook_params() after ensure_null()
2054
        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.
2055
        old_revno, old_revid = self.last_revision_info()
2230.3.49 by Aaron Bentley
Fix cache updating
2056
        if self._get_append_revisions_only():
2057
            self._check_history_violation(revision_id)
3517.2.1 by Andrew Bennetts
Quick draft of pre_change_branch_tip hook.
2058
        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
2059
        self._write_last_revision_info(revno, revision_id)
2375.1.6 by Andrew Bennetts
Rename _clear_cached_data to _clear_cached_state.
2060
        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.
2061
        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.
2062
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230.3.49 by Aaron Bentley
Fix cache updating
2063
2230.3.32 by Aaron Bentley
Implement strict history policy
2064
    def _check_history_violation(self, revision_id):
2598.5.4 by Aaron Bentley
Restore original Branch.last_revision behavior, fix bits that care
2065
        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
2066
        if _mod_revision.is_null(last_revision):
2230.3.32 by Aaron Bentley
Implement strict history policy
2067
            return
2068
        if last_revision not in self._lefthand_history(revision_id):
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2069
            raise errors.AppendRevisionsOnlyViolation(self.base)
2230.3.32 by Aaron Bentley
Implement strict history policy
2070
2230.4.1 by Aaron Bentley
Get log as fast branch5
2071
    def _gen_revision_history(self):
2230.3.2 by Aaron Bentley
Get all branch tests passing
2072
        """Generate the revision history from last revision
2073
        """
3495.2.1 by Aaron Bentley
Tolerate ghosts in mainline (#235055)
2074
        last_revno, last_revision = self.last_revision_info()
2075
        self._extend_partial_history(stop_index=last_revno-1)
3298.2.10 by Aaron Bentley
Refactor partial history code
2076
        return list(reversed(self._partial_revision_history_cache))
2077
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2078
    def _extend_partial_history(self, stop_index=None, stop_revision=None):
3298.2.10 by Aaron Bentley
Refactor partial history code
2079
        """Extend the partial history to include a given index
2080
3298.3.1 by Aaron Bentley
Make stop_revision optional for extend_partial_history
2081
        If a stop_index is supplied, stop when that index has been reached.
3298.2.17 by Aaron Bentley
Update from review
2082
        If a stop_revision is supplied, stop when that revision is
2083
        encountered.  Otherwise, stop when the beginning of history is
2084
        reached.
3298.2.10 by Aaron Bentley
Refactor partial history code
2085
3298.2.17 by Aaron Bentley
Update from review
2086
        :param stop_index: The index which should be present.  When it is
2087
            present, history extension will stop.
2088
        :param revision_id: The revision id which should be present.  When
2089
            it is encountered, history extension will stop.
3298.2.10 by Aaron Bentley
Refactor partial history code
2090
        """
2091
        repo = self.repository
2092
        if len(self._partial_revision_history_cache) == 0:
2093
            iterator = repo.iter_reverse_revision_history(self.last_revision())
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2094
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2095
            start_revision = self._partial_revision_history_cache[-1]
2096
            iterator = repo.iter_reverse_revision_history(start_revision)
2097
            #skip the last revision in the list
3298.3.3 by Aaron Bentley
Update from review
2098
            next_revision = iterator.next()
3298.2.10 by Aaron Bentley
Refactor partial history code
2099
        for revision_id in iterator:
2100
            self._partial_revision_history_cache.append(revision_id)
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2101
            if (stop_index is not None and
2102
                len(self._partial_revision_history_cache) > stop_index):
2103
                break
2104
            if revision_id == stop_revision:
3298.2.10 by Aaron Bentley
Refactor partial history code
2105
                break
2230.3.2 by Aaron Bentley
Get all branch tests passing
2106
2230.3.49 by Aaron Bentley
Fix cache updating
2107
    def _write_revision_history(self, history):
2108
        """Factored out of set_revision_history.
2109
2110
        This performs the actual writing to disk, with format-specific checks.
2111
        It is intended to be called by BzrBranch5.set_revision_history.
2112
        """
2230.3.2 by Aaron Bentley
Get all branch tests passing
2113
        if len(history) == 0:
2230.3.49 by Aaron Bentley
Fix cache updating
2114
            last_revision = 'null:'
2230.3.2 by Aaron Bentley
Get all branch tests passing
2115
        else:
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
2116
            if history != self._lefthand_history(history[-1]):
2117
                raise errors.NotLefthandHistory(history)
2230.3.49 by Aaron Bentley
Fix cache updating
2118
            last_revision = history[-1]
2119
        if self._get_append_revisions_only():
2120
            self._check_history_violation(last_revision)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2121
        self._write_last_revision_info(len(history), last_revision)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2122
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2123
    @needs_write_lock
2124
    def _set_parent_location(self, url):
2125
        """Set the parent branch"""
2126
        self._set_config_location('parent_location', url, make_relative=True)
2230.3.3 by Aaron Bentley
Add more config testing
2127
2128
    @needs_read_lock
2230.3.8 by Aaron Bentley
Abstract mechanism from policy getting/setting parents
2129
    def _get_parent_location(self):
2230.3.3 by Aaron Bentley
Add more config testing
2130
        """Set the parent branch"""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2131
        return self._get_config_location('parent_location')
2230.3.3 by Aaron Bentley
Add more config testing
2132
2133
    def set_push_location(self, location):
2134
        """See Branch.set_push_location."""
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2135
        self._set_config_location('push_location', location)
2230.3.3 by Aaron Bentley
Add more config testing
2136
2137
    def set_bound_location(self, location):
2138
        """See Branch.set_push_location."""
2230.3.7 by Aaron Bentley
Fix binding return values
2139
        result = None
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2140
        config = self.get_config()
2230.3.6 by Aaron Bentley
work in progress bind stuff
2141
        if location is None:
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2142
            if config.get_user_option('bound') != 'True':
2230.3.7 by Aaron Bentley
Fix binding return values
2143
                return False
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2144
            else:
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2145
                config.set_user_option('bound', 'False', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2146
                return True
2147
        else:
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2148
            self._set_config_location('bound_location', location,
2149
                                      config=config)
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2150
            config.set_user_option('bound', 'True', warn_masked=True)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2151
        return True
2152
2153
    def _get_bound_location(self, bound):
2154
        """Return the bound location in the config file.
2155
2156
        Return None if the bound parameter does not match"""
2157
        config = self.get_config()
2158
        config_bound = (config.get_user_option('bound') == 'True')
2159
        if config_bound != bound:
2160
            return None
2230.3.36 by Aaron Bentley
Refactor getting/setting locations with config
2161
        return self._get_config_location('bound_location', config=config)
2230.3.3 by Aaron Bentley
Add more config testing
2162
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
2163
    def get_bound_location(self):
2164
        """See Branch.set_push_location."""
2165
        return self._get_bound_location(True)
2166
2167
    def get_old_bound_location(self):
2168
        """See Branch.get_old_bound_location"""
2169
        return self._get_bound_location(False)
2170
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2171
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2172
        self._check_stackable_repo()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2173
        stacked_url = self._get_config_location('stacked_on_location')
2174
        if stacked_url is None:
3221.11.6 by Robert Collins
Stackable branch fixes.
2175
            raise errors.NotStacked(self)
2176
        return stacked_url
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2177
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2178
    def set_append_revisions_only(self, enabled):
2179
        if enabled:
2230.3.32 by Aaron Bentley
Implement strict history policy
2180
            value = 'True'
2181
        else:
2182
            value = 'False'
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
2183
        self.get_config().set_user_option('append_revisions_only', value,
2184
            warn_masked=True)
2230.3.32 by Aaron Bentley
Implement strict history policy
2185
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2186
    def set_stacked_on_url(self, url):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2187
        self._check_stackable_repo()
3221.11.6 by Robert Collins
Stackable branch fixes.
2188
        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.
2189
            try:
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2190
                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.
2191
            except (errors.NotStacked, errors.UnstackableBranchFormat,
2192
                errors.UnstackableRepositoryFormat):
2193
                return
3221.11.6 by Robert Collins
Stackable branch fixes.
2194
            url = ''
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
2195
            # repositories don't offer an interface to remove fallback
2196
            # repositories today; take the conceptually simpler option and just
2197
            # reopen it.
2198
            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.
2199
            # for every revision reference the branch has, ensure it is pulled
2200
            # in.
2201
            source_repository = self._get_fallback_repository(old_url)
2202
            for revision_id in chain([self.last_revision()],
2203
                self.tags.get_reverse_tag_dict()):
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2204
                self.repository.fetch(source_repository, revision_id,
2205
                    find_ghosts=True)
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
2206
        else:
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
2207
            self._activate_fallback_location(url)
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
2208
        # write this out after the repository is stacked to avoid setting a
2209
        # stacked config that doesn't work.
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2210
        self._set_config_location('stacked_on_location', url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2211
2230.3.40 by Aaron Bentley
Rename strict_revision_history to append_revisions_only
2212
    def _get_append_revisions_only(self):
2213
        value = self.get_config().get_user_option('append_revisions_only')
2214
        return value == 'True'
2230.3.32 by Aaron Bentley
Implement strict history policy
2215
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2216
    def _synchronize_history(self, destination, revision_id):
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2217
        """Synchronize last revision and revision history between branches.
2218
2219
        This version is most efficient when the destination is also a
2220
        BzrBranch6, but works for BzrBranch5, as long as the destination's
2221
        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
2222
        last_revision.  If not, set_last_revision_info will fail.
2230.3.35 by Aaron Bentley
Add documentation for synchonize_history
2223
2224
        :param destination: The branch to copy the history into
2225
        :param revision_id: The revision-id to truncate history at.  May
2226
          be None to copy complete history.
2227
        """
2697.2.3 by Martin Pool
More append_revision cleanup; _synchronize_history optimization
2228
        source_revno, source_revision_id = self.last_revision_info()
2230.3.18 by Aaron Bentley
Handle history sync as a special operation
2229
        if revision_id is None:
2697.2.3 by Martin Pool
More append_revision cleanup; _synchronize_history optimization
2230
            revno, revision_id = source_revno, source_revision_id
2231
        elif source_revision_id == revision_id:
2232
            # we know the revno without needing to walk all of history
2233
            revno = source_revno
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2234
        else:
2592.3.155 by Robert Collins
Remove some spurious differences with bzr.dev.
2235
            # To figure out the revno for a random revision, we need to build
2236
            # the revision history, and count its length.
2237
            # We don't care about the order, just how long it is.
2238
            # Alternatively, we could start at the current location, and count
2239
            # backwards. But there is no guarantee that we will find it since
2240
            # it may be a merged revision.
2241
            revno = len(list(self.repository.iter_reverse_revision_history(
2242
                                                                revision_id)))
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
2243
        destination.set_last_revision_info(revno, revision_id)
2230.3.1 by Aaron Bentley
Get branch6 creation working
2244
2220.2.27 by Martin Pool
Start adding tags to Branch6
2245
    def _make_tags(self):
2246
        return BasicTags(self)
2247
3240.1.2 by Aaron Bentley
Add write lock
2248
    @needs_write_lock
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2249
    def generate_revision_history(self, revision_id, last_rev=None,
2250
                                  other_branch=None):
3240.1.6 by Aaron Bentley
Update docs
2251
        """See BzrBranch5.generate_revision_history"""
3240.1.1 by Aaron Bentley
Avoid doing Branch._lefthand_history twice
2252
        history = self._lefthand_history(revision_id, last_rev, other_branch)
2253
        revno = len(history)
2254
        self.set_last_revision_info(revno, revision_id)
2255
3060.3.3 by Lukáš Lalinský
Make RevisionSpec_revid and RevisionSpec_revno not load the whole revision history.
2256
    @needs_read_lock
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2257
    def get_rev_id(self, revno, history=None):
2258
        """Find the revision id of the specified revno."""
2259
        if revno == 0:
2260
            return _mod_revision.NULL_REVISION
2261
2262
        last_revno, last_revision_id = self.last_revision_info()
2263
        if revno <= 0 or revno > last_revno:
2264
            raise errors.NoSuchRevision(self, revno)
2265
2266
        if history is not None:
3298.3.3 by Aaron Bentley
Update from review
2267
            return history[revno - 1]
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2268
3298.2.10 by Aaron Bentley
Refactor partial history code
2269
        index = last_revno - revno
3298.3.2 by Aaron Bentley
Catch history mismatch, cleanup
2270
        if len(self._partial_revision_history_cache) <= index:
2271
            self._extend_partial_history(stop_index=index)
3298.2.10 by Aaron Bentley
Refactor partial history code
2272
        if len(self._partial_revision_history_cache) > index:
2273
            return self._partial_revision_history_cache[index]
3060.3.6 by Lukáš Lalinský
Implement partial history cache in BzrBranch6.
2274
        else:
3298.2.10 by Aaron Bentley
Refactor partial history code
2275
            raise errors.NoSuchRevision(self, revno)
3060.3.2 by Lukáš Lalinský
Make RevisionSpec_last not load the whole history.
2276
3298.2.12 by Aaron Bentley
Add Branch6.revision_id_to_revno
2277
    @needs_read_lock
2278
    def revision_id_to_revno(self, revision_id):
2279
        """Given a revision id, return its revno"""
2280
        if _mod_revision.is_null(revision_id):
2281
            return 0
2282
        try:
2283
            index = self._partial_revision_history_cache.index(revision_id)
2284
        except ValueError:
2285
            self._extend_partial_history(stop_revision=revision_id)
2286
            index = len(self._partial_revision_history_cache) - 1
2287
            if self._partial_revision_history_cache[index] != revision_id:
2288
                raise errors.NoSuchRevision(self, revision_id)
2289
        return self.revno() - index
2290
2230.3.34 by Aaron Bentley
cleanup
2291
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2292
class BzrBranch6(BzrBranch7):
2293
    """See BzrBranchFormat6 for the capabilities of this branch.
2294
3221.18.1 by Ian Clatworthy
tweaks by ianc during review
2295
    This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2296
    i.e. stacking.
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2297
    """
2298
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
2299
    def get_stacked_on_url(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2300
        raise errors.UnstackableBranchFormat(self._format, self.base)
2301
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
2302
    def set_stacked_on_url(self, url):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
2303
        raise errors.UnstackableBranchFormat(self._format, self.base)
2304
2305
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2306
######################################################################
2307
# results of operations
2308
2220.2.37 by Martin Pool
Report conflicting tags from push.
2309
2310
class _Result(object):
2311
2312
    def _show_tag_conficts(self, to_file):
2313
        if not getattr(self, 'tag_conflicts', None):
2314
            return
2315
        to_file.write('Conflicting tags:\n')
2316
        for name, value1, value2 in self.tag_conflicts:
2317
            to_file.write('    %s\n' % (name, ))
2318
2319
2320
class PullResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2321
    """Result of a Branch.pull operation.
2322
2323
    :ivar old_revno: Revision number before pull.
2324
    :ivar new_revno: Revision number after pull.
2325
    :ivar old_revid: Tip revision id before pull.
2326
    :ivar new_revid: Tip revision id after pull.
2327
    :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.
2328
    :ivar master_branch: Master branch of the target, or the target if no
2329
        Master
2330
    :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
2331
    :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.
2332
    :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
2333
    """
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2334
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
2335
    def __int__(self):
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2336
        # DEPRECATED: pull used to return the change in revno
2337
        return self.new_revno - self.old_revno
2338
2220.2.39 by Martin Pool
Pull also merges tags and warns if they conflict
2339
    def report(self, to_file):
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
2340
        if not is_quiet():
2341
            if self.old_revid == self.new_revid:
2342
                to_file.write('No revisions to pull.\n')
2343
            else:
2344
                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
2345
        self._show_tag_conficts(to_file)
2346
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2347
2220.2.37 by Martin Pool
Report conflicting tags from push.
2348
class PushResult(_Result):
2297.1.6 by Martin Pool
Add docs for Results, give some members cleaner names
2349
    """Result of a Branch.push operation.
2350
2351
    :ivar old_revno: Revision number before push.
2352
    :ivar new_revno: Revision number after push.
2353
    :ivar old_revid: Tip revision id before push.
2354
    :ivar new_revid: Tip revision id after push.
2355
    :ivar source_branch: Source branch object.
2356
    :ivar master_branch: Master branch of the target, or None.
2357
    :ivar target_branch: Target/destination branch object.
2358
    """
2297.1.4 by Martin Pool
Push now returns a PushResult rather than just an integer.
2359
2360
    def __int__(self):
2361
        # 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()
2362
        return self.new_revno - self.old_revno
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2363
2220.2.37 by Martin Pool
Report conflicting tags from push.
2364
    def report(self, to_file):
2365
        """Write a human-readable description of the result."""
2366
        if self.old_revid == self.new_revid:
2367
            to_file.write('No new revisions to push.\n')
2368
        else:
2369
            to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2370
        self._show_tag_conficts(to_file)
2371
2297.1.1 by Martin Pool
Pull now returns a PullResult rather than just an integer.
2372
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
2373
class BranchCheckResult(object):
2374
    """Results of checking branch consistency.
2375
2376
    :see: Branch.check
2377
    """
2378
2379
    def __init__(self, branch):
2380
        self.branch = branch
2381
2382
    def report_results(self, verbose):
2383
        """Report the check results via trace.note.
2384
        
2385
        :param verbose: Requests more detailed display of what was checked,
2386
            if any.
2387
        """
2388
        note('checked branch %s format %s',
2389
             self.branch.base,
2390
             self.branch._format)
2391
2392
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2393
class Converter5to6(object):
2394
    """Perform an in-place upgrade of format 5 to format 6"""
2395
2396
    def convert(self, branch):
2397
        # Data for 5 and 6 can peacefully coexist.
2398
        format = BzrBranchFormat6()
2399
        new_branch = format.open(branch.bzrdir, _found=True)
2400
2401
        # 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.
2402
        new_branch._write_last_revision_info(*branch.last_revision_info())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2403
        new_branch.set_parent(branch.get_parent())
2404
        new_branch.set_bound_location(branch.get_bound_location())
2405
        new_branch.set_push_location(branch.get_push_location())
2406
2220.2.43 by Martin Pool
Should clear tag file when upgrading format 5 to 6 to prevent warning
2407
        # New branch has no tags by default
2408
        new_branch.tags._set_tag_dict({})
2409
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2410
        # Copying done; now update target format
3407.2.5 by Martin Pool
Deprecate LockableFiles.put_utf8
2411
        new_branch._transport.put_bytes('format',
2412
            format.get_format_string(),
3468.1.1 by Martin Pool
Update more users of default file modes from control_files to bzrdir
2413
            mode=new_branch.bzrdir._get_file_mode())
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2414
2415
        # Clean up old files
3407.2.13 by Martin Pool
Remove indirection through control_files to get transports
2416
        new_branch._transport.delete('revision-history')
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2417
        try:
2418
            branch.set_parent(None)
3236.1.2 by Michael Hudson
clean up branch.py imports
2419
        except errors.NoSuchFile:
2230.3.29 by Aaron Bentley
Implement conversion to branch 6
2420
            pass
2421
        branch.set_bound_location(None)
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
2422
2423
2424
class Converter6to7(object):
2425
    """Perform an in-place upgrade of format 6 to format 7"""
2426
2427
    def convert(self, branch):
3221.11.5 by Robert Collins
Correctly handle multi-step branch upgrades.
2428
        format = BzrBranchFormat7()
3221.18.2 by Ian Clatworthy
store stacked-on location in branch.conf
2429
        branch._set_config_location('stacked_on_location', '')
3221.11.4 by Robert Collins
Add a converter for format 7 branches.
2430
        # update target format
3221.13.5 by Ian Clatworthy
fix LockableFiles deprecations
2431
        branch._transport.put_bytes('format', format.get_format_string())