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