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