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