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