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