/brz/remove-bazaar

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