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