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