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