/brz/remove-bazaar

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