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