/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
1
# Copyright (C) 2006 Canonical Ltd
2
#
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.
7
#
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.
12
#
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
16
17
"""Server-side branch related request implmentations."""
18
19
20
from bzrlib import errors
21
from bzrlib.bzrdir import BzrDir
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
22
from bzrlib.smart.request import (
23
    FailedSmartServerResponse,
24
    SmartServerRequest,
25
    SuccessfulSmartServerResponse,
26
    )
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
27
28
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
29
class SmartServerBranchRequest(SmartServerRequest):
2692.1.10 by Andrew Bennetts
More docstring polish
30
    """Base class for handling common branch request logic.
31
    """
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
32
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
33
    def do(self, path, *args):
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
34
        """Execute a request for a branch at path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
35
2692.1.10 by Andrew Bennetts
More docstring polish
36
        All Branch requests take a path to the branch as their first argument.
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
37
38
        If the branch is a branch reference, NotBranchError is raised.
2692.1.10 by Andrew Bennetts
More docstring polish
39
40
        :param path: The path for the repository as received from the
41
            client.
42
        :return: A SmartServerResponse from self.do_with_branch().
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
43
        """
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
44
        transport = self.transport_from_client_path(path)
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
45
        bzrdir = BzrDir.open_from_transport(transport)
46
        if bzrdir.get_branch_reference() is not None:
47
            raise errors.NotBranchError(transport.base)
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
48
        branch = bzrdir.open_branch(ignore_fallbacks=True)
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
49
        return self.do_with_branch(branch, *args)
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
50
51
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
52
class SmartServerLockedBranchRequest(SmartServerBranchRequest):
53
    """Base class for handling common branch request logic for requests that
54
    need a write lock.
55
    """
56
57
    def do_with_branch(self, branch, branch_token, repo_token, *args):
58
        """Execute a request for a branch.
59
60
        A write lock will be acquired with the given tokens for the branch and
61
        repository locks.  The lock will be released once the request is
62
        processed.  The physical lock state won't be changed.
63
        """
64
        # XXX: write a test for LockContention
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).
65
        branch.repository.lock_write(token=repo_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
66
        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).
67
            branch.lock_write(token=branch_token)
68
            try:
69
                return self.do_with_locked_branch(branch, *args)
70
            finally:
71
                branch.unlock()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
72
        finally:
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).
73
            branch.repository.unlock()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
74
75
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
76
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
77
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
78
    def do_with_branch(self, branch):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
79
        """Return the content of branch.conf
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
80
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
81
        The body is not utf8 decoded - its the literal bytestream from disk.
82
        """
83
        try:
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
84
            content = branch._transport.get_bytes('branch.conf')
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
85
        except errors.NoSuchFile:
86
            content = ''
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
87
        return SuccessfulSmartServerResponse( ('ok', ), content)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
88
89
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
90
class SmartServerBranchGetParent(SmartServerBranchRequest):
91
92
    def do_with_branch(self, branch):
93
        """Return the parent of branch."""
94
        parent = branch._get_parent_location() or ''
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
95
        return SuccessfulSmartServerResponse((parent,))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
96
97
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
98
class SmartServerBranchGetTagsBytes(SmartServerBranchRequest):
99
100
    def do_with_branch(self, branch):
101
        """Return the _get_tags_bytes for a branch."""
102
        bytes = branch._get_tags_bytes()
103
        return SuccessfulSmartServerResponse((bytes,))
104
105
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
106
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
107
108
    def do_with_branch(self, branch):
109
        stacked_on_url = branch.get_stacked_on_url()
110
        return SuccessfulSmartServerResponse(('ok', stacked_on_url))
111
112
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
113
class SmartServerRequestRevisionHistory(SmartServerBranchRequest):
114
115
    def do_with_branch(self, branch):
116
        """Get the revision history for the branch.
117
118
        The revision list is returned as the body content,
119
        with each revision utf8 encoded and \x00 joined.
120
        """
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
121
        return SuccessfulSmartServerResponse(
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
122
            ('ok', ), ('\x00'.join(branch.revision_history())))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
123
124
125
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
126
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
127
    def do_with_branch(self, branch):
128
        """Return branch.last_revision_info().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
129
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
130
        The revno is encoded in decimal, the revision_id is encoded as utf8.
131
        """
132
        revno, last_revision = branch.last_revision_info()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
133
        return SuccessfulSmartServerResponse(('ok', str(revno), last_revision))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
134
135
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
136
class SmartServerSetTipRequest(SmartServerLockedBranchRequest):
137
    """Base class for handling common branch request logic for requests that
138
    update the branch tip.
139
    """
140
141
    def do_with_locked_branch(self, branch, *args):
142
        try:
143
            return self.do_tip_change_with_locked_branch(branch, *args)
144
        except errors.TipChangeRejected, e:
145
            msg = e.msg
146
            if isinstance(msg, unicode):
147
                msg = msg.encode('utf-8')
148
            return FailedSmartServerResponse(('TipChangeRejected', msg))
149
150
151
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
152
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
153
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
154
        if new_last_revision_id == 'null:':
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
155
            branch.set_revision_history([])
156
        else:
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
157
            if not branch.repository.has_revision(new_last_revision_id):
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
158
                return FailedSmartServerResponse(
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
159
                    ('NoSuchRevision', new_last_revision_id))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
160
            branch.set_revision_history(branch._lefthand_history(
161
                new_last_revision_id, None, None))
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
162
        return SuccessfulSmartServerResponse(('ok',))
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
163
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
164
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
165
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
166
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
167
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
168
            allow_divergence, allow_overwrite_descendant):
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
169
        """Set the last revision of the branch.
170
171
        New in 1.6.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
173
        :param new_last_revision_id: the revision ID to set as the last
174
            revision of the branch.
175
        :param allow_divergence: A flag.  If non-zero, change the revision ID
176
            even if the new_last_revision_id's ancestry has diverged from the
177
            current last revision.  If zero, a 'Diverged' error will be
178
            returned if new_last_revision_id is not a descendant of the current
179
            last revision.
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
180
        :param allow_overwrite_descendant:  A flag.  If zero and
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
181
            new_last_revision_id is not a descendant of the current last
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
182
            revision, then the last revision will not be changed.  If non-zero
183
            and there is no divergence, then the last revision is always
184
            changed.
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
185
186
        :returns: on success, a tuple of ('ok', revno, revision_id), where
187
            revno and revision_id are the new values of the current last
188
            revision info.  The revision_id might be different to the
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
189
            new_last_revision_id if allow_overwrite_descendant was not set.
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
190
        """
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
191
        do_not_overwrite_descendant = not allow_overwrite_descendant
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
192
        try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
193
            last_revno, last_rev = branch.last_revision_info()
194
            graph = branch.repository.get_graph()
195
            if not allow_divergence or do_not_overwrite_descendant:
196
                relation = branch._revision_relations(
197
                    last_rev, new_last_revision_id, graph)
198
                if relation == 'diverged' and not allow_divergence:
199
                    return FailedSmartServerResponse(('Diverged',))
200
                if relation == 'a_descends_from_b' and do_not_overwrite_descendant:
201
                    return SuccessfulSmartServerResponse(
202
                        ('ok', last_revno, last_rev))
203
            new_revno = graph.find_distance_to_null(
204
                new_last_revision_id, [(last_rev, last_revno)])
205
            branch.set_last_revision_info(new_revno, new_last_revision_id)
3441.5.23 by Andrew Bennetts
Fix test failures.
206
        except errors.GhostRevisionsHaveNoRevno:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
207
            return FailedSmartServerResponse(
208
                ('NoSuchRevision', new_last_revision_id))
3441.5.18 by Andrew Bennetts
Fix some test failures.
209
        return SuccessfulSmartServerResponse(
210
            ('ok', new_revno, new_last_revision_id))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
211
212
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
213
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest):
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
214
    """Branch.set_last_revision_info.  Sets the revno and the revision ID of
215
    the specified branch.
216
217
    New in bzrlib 1.4.
218
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
219
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
220
    def do_tip_change_with_locked_branch(self, branch, new_revno,
221
            new_last_revision_id):
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
222
        try:
223
            branch.set_last_revision_info(int(new_revno), new_last_revision_id)
224
        except errors.NoSuchRevision:
225
            return FailedSmartServerResponse(
226
                ('NoSuchRevision', new_last_revision_id))
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
227
        return SuccessfulSmartServerResponse(('ok',))
228
229
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
230
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
231
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
232
    def do_with_branch(self, branch, branch_token='', repo_token=''):
233
        if branch_token == '':
234
            branch_token = None
235
        if repo_token == '':
236
            repo_token = None
237
        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).
238
            repo_token = branch.repository.lock_write(token=repo_token)
239
            try:
240
                branch_token = branch.lock_write(token=branch_token)
241
            finally:
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
242
                # this leaves the repository with 1 lock
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).
243
                branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
244
        except errors.LockContention:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
245
            return FailedSmartServerResponse(('LockContention',))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
246
        except errors.TokenMismatch:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
247
            return FailedSmartServerResponse(('TokenMismatch',))
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
248
        except errors.UnlockableTransport:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
249
            return FailedSmartServerResponse(('UnlockableTransport',))
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
250
        except errors.LockFailed, e:
251
            return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why)))
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
252
        if repo_token is None:
253
            repo_token = ''
254
        else:
255
            branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
256
        branch.leave_lock_in_place()
257
        branch.unlock()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
258
        return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
259
260
261
class SmartServerBranchRequestUnlock(SmartServerBranchRequest):
262
263
    def do_with_branch(self, branch, branch_token, repo_token):
264
        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).
265
            branch.repository.lock_write(token=repo_token)
266
            try:
267
                branch.lock_write(token=branch_token)
268
            finally:
269
                branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
270
        except errors.TokenMismatch:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
271
            return FailedSmartServerResponse(('TokenMismatch',))
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
272
        if repo_token:
273
            branch.repository.dont_leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
274
        branch.dont_leave_lock_in_place()
275
        branch.unlock()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
276
        return SuccessfulSmartServerResponse(('ok',))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
277