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