/brz/remove-bazaar

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