/brz/remove-bazaar

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