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