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