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