~bzr-pqm/bzr/bzr.dev

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