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