~bzr-pqm/bzr/bzr.dev

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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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.
2692.1.10 by Andrew Bennetts
More docstring polish
35
    
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)
48
        branch = bzrdir.open_branch()
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):
77
    
78
    def do_with_branch(self, branch):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
79
        """Return the content of branch.conf
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
80
        
81
        The body is not utf8 decoded - its the literal bytestream from disk.
82
        """
3407.2.2 by Martin Pool
Remove special case in RemoteBranchLockableFiles for branch.conf
83
        # This was at one time called by RemoteBranchLockableFiles
84
        # intercepting access to this file; as of 1.5 it is not called by the
85
        # client but retained for compatibility.  It may be called again to
86
        # allow the client to get the configuration without needing vfs
87
        # access.
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
88
        try:
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
89
            content = branch._transport.get_bytes('branch.conf')
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
90
        except errors.NoSuchFile:
91
            content = ''
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
92
        return SuccessfulSmartServerResponse( ('ok', ), content)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
93
94
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
95
class SmartServerRequestRevisionHistory(SmartServerBranchRequest):
96
97
    def do_with_branch(self, branch):
98
        """Get the revision history for the branch.
99
100
        The revision list is returned as the body content,
101
        with each revision utf8 encoded and \x00 joined.
102
        """
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
103
        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.
104
            ('ok', ), ('\x00'.join(branch.revision_history())))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
105
106
107
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
108
    
109
    def do_with_branch(self, branch):
110
        """Return branch.last_revision_info().
111
        
112
        The revno is encoded in decimal, the revision_id is encoded as utf8.
113
        """
114
        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.
115
        return SuccessfulSmartServerResponse(('ok', str(revno), last_revision))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
116
117
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
118
class SmartServerSetTipRequest(SmartServerLockedBranchRequest):
119
    """Base class for handling common branch request logic for requests that
120
    update the branch tip.
121
    """
122
123
    def do_with_locked_branch(self, branch, *args):
124
        try:
125
            return self.do_tip_change_with_locked_branch(branch, *args)
126
        except errors.TipChangeRejected, e:
127
            msg = e.msg
128
            if isinstance(msg, unicode):
129
                msg = msg.encode('utf-8')
130
            return FailedSmartServerResponse(('TipChangeRejected', msg))
131
132
133
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
134
    
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
135
    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.
136
        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.
137
            branch.set_revision_history([])
138
        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.
139
            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.
140
                return FailedSmartServerResponse(
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
141
                    ('NoSuchRevision', new_last_revision_id))
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
142
            branch.generate_revision_history(new_last_revision_id)
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
143
        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.
144
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
145
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
146
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
147
    
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
148
    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.
149
            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.
150
        """Set the last revision of the branch.
151
152
        New in 1.6.
153
        
154
        :param new_last_revision_id: the revision ID to set as the last
155
            revision of the branch.
156
        :param allow_divergence: A flag.  If non-zero, change the revision ID
157
            even if the new_last_revision_id's ancestry has diverged from the
158
            current last revision.  If zero, a 'Diverged' error will be
159
            returned if new_last_revision_id is not a descendant of the current
160
            last revision.
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
161
        :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.
162
            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.
163
            revision, then the last revision will not be changed.  If non-zero
164
            and there is no divergence, then the last revision is always
165
            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.
166
167
        :returns: on success, a tuple of ('ok', revno, revision_id), where
168
            revno and revision_id are the new values of the current last
169
            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.
170
            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.
171
        """
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
172
        do_not_overwrite_descendant = not allow_overwrite_descendant
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
173
        try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
174
            last_revno, last_rev = branch.last_revision_info()
175
            graph = branch.repository.get_graph()
176
            if not allow_divergence or do_not_overwrite_descendant:
177
                relation = branch._revision_relations(
178
                    last_rev, new_last_revision_id, graph)
179
                if relation == 'diverged' and not allow_divergence:
180
                    return FailedSmartServerResponse(('Diverged',))
181
                if relation == 'a_descends_from_b' and do_not_overwrite_descendant:
182
                    return SuccessfulSmartServerResponse(
183
                        ('ok', last_revno, last_rev))
184
            new_revno = graph.find_distance_to_null(
185
                new_last_revision_id, [(last_rev, last_revno)])
186
            branch.set_last_revision_info(new_revno, new_last_revision_id)
3441.5.23 by Andrew Bennetts
Fix test failures.
187
        except errors.GhostRevisionsHaveNoRevno:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
188
            return FailedSmartServerResponse(
189
                ('NoSuchRevision', new_last_revision_id))
3441.5.18 by Andrew Bennetts
Fix some test failures.
190
        return SuccessfulSmartServerResponse(
191
            ('ok', new_revno, new_last_revision_id))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
192
193
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
194
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest):
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
195
    """Branch.set_last_revision_info.  Sets the revno and the revision ID of
196
    the specified branch.
197
198
    New in bzrlib 1.4.
199
    """
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
200
    
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
201
    def do_tip_change_with_locked_branch(self, branch, new_revno,
202
            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.
203
        try:
204
            branch.set_last_revision_info(int(new_revno), new_last_revision_id)
205
        except errors.NoSuchRevision:
206
            return FailedSmartServerResponse(
207
                ('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.
208
        return SuccessfulSmartServerResponse(('ok',))
209
210
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
211
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
212
    
213
    def do_with_branch(self, branch, branch_token='', repo_token=''):
214
        if branch_token == '':
215
            branch_token = None
216
        if repo_token == '':
217
            repo_token = None
218
        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).
219
            repo_token = branch.repository.lock_write(token=repo_token)
220
            try:
221
                branch_token = branch.lock_write(token=branch_token)
222
            finally:
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
223
                # 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).
224
                branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
225
        except errors.LockContention:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
226
            return FailedSmartServerResponse(('LockContention',))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
227
        except errors.TokenMismatch:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
228
            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.
229
        except errors.UnlockableTransport:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
230
            return FailedSmartServerResponse(('UnlockableTransport',))
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
231
        except errors.LockFailed, e:
232
            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.
233
        if repo_token is None:
234
            repo_token = ''
235
        else:
236
            branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
237
        branch.leave_lock_in_place()
238
        branch.unlock()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
239
        return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
240
241
242
class SmartServerBranchRequestUnlock(SmartServerBranchRequest):
243
244
    def do_with_branch(self, branch, branch_token, repo_token):
245
        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).
246
            branch.repository.lock_write(token=repo_token)
247
            try:
248
                branch.lock_write(token=branch_token)
249
            finally:
250
                branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
251
        except errors.TokenMismatch:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
252
            return FailedSmartServerResponse(('TokenMismatch',))
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
253
        if repo_token:
254
            branch.repository.dont_leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
255
        branch.dont_leave_lock_in_place()
256
        branch.unlock()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
257
        return SuccessfulSmartServerResponse(('ok',))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
258