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  | 
||
| 
4556.2.1
by Andrew Bennetts
 Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.  | 
106  | 
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):  | 
107  | 
||
| 
4760.1.1
by Andrew Bennetts
 Add optional jail_root argument to SmartServerRequest and friends, and use it in the WSGI glue. Allows opening branches in shared repos via bzr+http (assuming the repo should be accessible).  | 
108  | 
def __init__(self, backing_transport, root_client_path='/', jail_root=None):  | 
| 
4556.2.2
by Andrew Bennetts
 Handle failures more gracefully.  | 
109  | 
SmartServerLockedBranchRequest.__init__(  | 
| 
4760.1.1
by Andrew Bennetts
 Add optional jail_root argument to SmartServerRequest and friends, and use it in the WSGI glue. Allows opening branches in shared repos via bzr+http (assuming the repo should be accessible).  | 
110  | 
self, backing_transport, root_client_path, jail_root)  | 
| 
4556.2.2
by Andrew Bennetts
 Handle failures more gracefully.  | 
111  | 
self.locked = False  | 
112  | 
||
| 
4556.2.1
by Andrew Bennetts
 Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.  | 
113  | 
def do_with_locked_branch(self, branch):  | 
| 
4556.2.4
by Andrew Bennetts
 Add NEWS entry, docstring.  | 
114  | 
"""Call _set_tags_bytes for a branch.  | 
115  | 
||
116  | 
        New in 1.18.
 | 
|
117  | 
        """
 | 
|
| 
4556.2.1
by Andrew Bennetts
 Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.  | 
118  | 
        # We need to keep this branch locked until we get a body with the tags
 | 
119  | 
        # bytes.
 | 
|
120  | 
self.branch = branch  | 
|
121  | 
self.branch.lock_write()  | 
|
| 
4556.2.2
by Andrew Bennetts
 Handle failures more gracefully.  | 
122  | 
self.locked = True  | 
| 
4556.2.1
by Andrew Bennetts
 Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.  | 
123  | 
|
124  | 
def do_body(self, bytes):  | 
|
125  | 
self.branch._set_tags_bytes(bytes)  | 
|
126  | 
return SuccessfulSmartServerResponse(())  | 
|
127  | 
||
128  | 
def do_end(self):  | 
|
| 
4556.2.8
by Andrew Bennetts
 Add TODO comment.  | 
129  | 
        # TODO: this request shouldn't have to do this housekeeping manually.
 | 
130  | 
        # Some of this logic probably belongs in a base class.
 | 
|
| 
4556.2.2
by Andrew Bennetts
 Handle failures more gracefully.  | 
131  | 
if not self.locked:  | 
132  | 
            # We never acquired the branch successfully in the first place, so
 | 
|
133  | 
            # there's nothing more to do.
 | 
|
134  | 
            return
 | 
|
| 
4556.2.1
by Andrew Bennetts
 Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.  | 
135  | 
try:  | 
136  | 
return SmartServerLockedBranchRequest.do_end(self)  | 
|
137  | 
finally:  | 
|
| 
4556.2.2
by Andrew Bennetts
 Handle failures more gracefully.  | 
138  | 
            # Only try unlocking if we locked successfully in the first place
 | 
| 
4556.2.1
by Andrew Bennetts
 Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.  | 
139  | 
self.branch.unlock()  | 
140  | 
||
141  | 
||
| 
3691.2.5
by Martin Pool
 Add Branch.get_stacked_on_url rpc and tests for same  | 
142  | 
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):  | 
143  | 
||
144  | 
def do_with_branch(self, branch):  | 
|
145  | 
stacked_on_url = branch.get_stacked_on_url()  | 
|
146  | 
return SuccessfulSmartServerResponse(('ok', stacked_on_url))  | 
|
147  | 
||
148  | 
||
| 
2018.5.49
by Wouter van Heyst
 Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to  | 
149  | 
class SmartServerRequestRevisionHistory(SmartServerBranchRequest):  | 
150  | 
||
151  | 
def do_with_branch(self, branch):  | 
|
152  | 
"""Get the revision history for the branch.  | 
|
153  | 
||
154  | 
        The revision list is returned as the body content,
 | 
|
155  | 
        with each revision utf8 encoded and \x00 joined.
 | 
|
156  | 
        """
 | 
|
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
157  | 
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.  | 
158  | 
('ok', ), ('\x00'.join(branch.revision_history())))  | 
| 
2018.5.50
by Wouter van Heyst
 Add SmartServerBranchRequestLastRevisionInfo method.  | 
159  | 
|
160  | 
||
161  | 
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
162  | 
|
| 
2018.5.50
by Wouter van Heyst
 Add SmartServerBranchRequestLastRevisionInfo method.  | 
163  | 
def do_with_branch(self, branch):  | 
164  | 
"""Return branch.last_revision_info().  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
165  | 
|
| 
2018.5.50
by Wouter van Heyst
 Add SmartServerBranchRequestLastRevisionInfo method.  | 
166  | 
        The revno is encoded in decimal, the revision_id is encoded as utf8.
 | 
167  | 
        """
 | 
|
168  | 
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.  | 
169  | 
return SuccessfulSmartServerResponse(('ok', str(revno), last_revision))  | 
| 
2018.5.50
by Wouter van Heyst
 Add SmartServerBranchRequestLastRevisionInfo method.  | 
170  | 
|
171  | 
||
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
172  | 
class SmartServerSetTipRequest(SmartServerLockedBranchRequest):  | 
173  | 
"""Base class for handling common branch request logic for requests that  | 
|
174  | 
    update the branch tip.
 | 
|
175  | 
    """
 | 
|
176  | 
||
177  | 
def do_with_locked_branch(self, branch, *args):  | 
|
178  | 
try:  | 
|
179  | 
return self.do_tip_change_with_locked_branch(branch, *args)  | 
|
180  | 
except errors.TipChangeRejected, e:  | 
|
181  | 
msg = e.msg  | 
|
182  | 
if isinstance(msg, unicode):  | 
|
183  | 
msg = msg.encode('utf-8')  | 
|
184  | 
return FailedSmartServerResponse(('TipChangeRejected', msg))  | 
|
185  | 
||
186  | 
||
| 
4226.2.1
by Robert Collins
 Set branch config options via a smart method.  | 
187  | 
class SmartServerBranchRequestSetConfigOption(SmartServerLockedBranchRequest):  | 
188  | 
"""Set an option in the branch configuration."""  | 
|
189  | 
||
190  | 
def do_with_locked_branch(self, branch, value, name, section):  | 
|
191  | 
if not section:  | 
|
192  | 
section = None  | 
|
| 
4226.2.2
by Robert Collins
 Fix setting config options to support unicode values and don't attempt to reset repositories _fallback_repositories as the simple approach fails to work.  | 
193  | 
branch._get_config().set_option(value.decode('utf8'), name, section)  | 
| 
4226.2.1
by Robert Collins
 Set branch config options via a smart method.  | 
194  | 
return SuccessfulSmartServerResponse(())  | 
195  | 
||
196  | 
||
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
197  | 
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
198  | 
|
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
199  | 
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.  | 
200  | 
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.  | 
201  | 
branch.set_revision_history([])  | 
202  | 
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.  | 
203  | 
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.  | 
204  | 
return FailedSmartServerResponse(  | 
| 
2018.12.3
by Andrew Bennetts
 Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.  | 
205  | 
('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.  | 
206  | 
branch.set_revision_history(branch._lefthand_history(  | 
207  | 
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.  | 
208  | 
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.  | 
209  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
210  | 
|
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
211  | 
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
212  | 
|
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
213  | 
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.  | 
214  | 
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.  | 
215  | 
"""Set the last revision of the branch.  | 
216  | 
||
217  | 
        New in 1.6.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
218  | 
|
| 
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.  | 
219  | 
        :param new_last_revision_id: the revision ID to set as the last
 | 
220  | 
            revision of the branch.
 | 
|
221  | 
        :param allow_divergence: A flag.  If non-zero, change the revision ID
 | 
|
222  | 
            even if the new_last_revision_id's ancestry has diverged from the
 | 
|
223  | 
            current last revision.  If zero, a 'Diverged' error will be
 | 
|
224  | 
            returned if new_last_revision_id is not a descendant of the current
 | 
|
225  | 
            last revision.
 | 
|
| 
3441.5.28
by Andrew Bennetts
 Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.  | 
226  | 
        :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.  | 
227  | 
            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.  | 
228  | 
            revision, then the last revision will not be changed.  If non-zero
 | 
229  | 
            and there is no divergence, then the last revision is always
 | 
|
230  | 
            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.  | 
231  | 
|
232  | 
        :returns: on success, a tuple of ('ok', revno, revision_id), where
 | 
|
233  | 
            revno and revision_id are the new values of the current last
 | 
|
234  | 
            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.  | 
235  | 
            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.  | 
236  | 
        """
 | 
| 
3441.5.28
by Andrew Bennetts
 Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.  | 
237  | 
do_not_overwrite_descendant = not allow_overwrite_descendant  | 
| 
3441.5.6
by Andrew Bennetts
 Greatly simplify RemoteBranch.update_revisions. Still needs more tests.  | 
238  | 
try:  | 
| 
3441.5.18
by Andrew Bennetts
 Fix some test failures.  | 
239  | 
last_revno, last_rev = branch.last_revision_info()  | 
240  | 
graph = branch.repository.get_graph()  | 
|
241  | 
if not allow_divergence or do_not_overwrite_descendant:  | 
|
242  | 
relation = branch._revision_relations(  | 
|
243  | 
last_rev, new_last_revision_id, graph)  | 
|
244  | 
if relation == 'diverged' and not allow_divergence:  | 
|
245  | 
return FailedSmartServerResponse(('Diverged',))  | 
|
246  | 
if relation == 'a_descends_from_b' and do_not_overwrite_descendant:  | 
|
247  | 
return SuccessfulSmartServerResponse(  | 
|
248  | 
('ok', last_revno, last_rev))  | 
|
249  | 
new_revno = graph.find_distance_to_null(  | 
|
250  | 
new_last_revision_id, [(last_rev, last_revno)])  | 
|
251  | 
branch.set_last_revision_info(new_revno, new_last_revision_id)  | 
|
| 
3441.5.23
by Andrew Bennetts
 Fix test failures.  | 
252  | 
except errors.GhostRevisionsHaveNoRevno:  | 
| 
3441.5.6
by Andrew Bennetts
 Greatly simplify RemoteBranch.update_revisions. Still needs more tests.  | 
253  | 
return FailedSmartServerResponse(  | 
254  | 
('NoSuchRevision', new_last_revision_id))  | 
|
| 
3441.5.18
by Andrew Bennetts
 Fix some test failures.  | 
255  | 
return SuccessfulSmartServerResponse(  | 
256  | 
('ok', new_revno, new_last_revision_id))  | 
|
| 
3441.5.6
by Andrew Bennetts
 Greatly simplify RemoteBranch.update_revisions. Still needs more tests.  | 
257  | 
|
258  | 
||
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
259  | 
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest):  | 
| 
3297.4.2
by Andrew Bennetts
 Add backwards compatibility for servers older than 1.4.  | 
260  | 
"""Branch.set_last_revision_info. Sets the revno and the revision ID of  | 
261  | 
    the specified branch.
 | 
|
262  | 
||
263  | 
    New in bzrlib 1.4.
 | 
|
264  | 
    """
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
265  | 
|
| 
3577.1.1
by Andrew Bennetts
 Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.  | 
266  | 
def do_tip_change_with_locked_branch(self, branch, new_revno,  | 
267  | 
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.  | 
268  | 
try:  | 
269  | 
branch.set_last_revision_info(int(new_revno), new_last_revision_id)  | 
|
270  | 
except errors.NoSuchRevision:  | 
|
271  | 
return FailedSmartServerResponse(  | 
|
272  | 
('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.  | 
273  | 
return SuccessfulSmartServerResponse(('ok',))  | 
274  | 
||
275  | 
||
| 
4288.1.7
by Robert Collins
 Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.  | 
276  | 
class SmartServerBranchRequestSetParentLocation(SmartServerLockedBranchRequest):  | 
277  | 
"""Set the parent location for a branch.  | 
|
278  | 
    
 | 
|
279  | 
    Takes a location to set, which must be utf8 encoded.
 | 
|
280  | 
    """
 | 
|
281  | 
||
282  | 
def do_with_locked_branch(self, branch, location):  | 
|
283  | 
branch._set_parent_location(location)  | 
|
284  | 
return SuccessfulSmartServerResponse(())  | 
|
285  | 
||
286  | 
||
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
287  | 
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
288  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
289  | 
def do_with_branch(self, branch, branch_token='', repo_token=''):  | 
290  | 
if branch_token == '':  | 
|
291  | 
branch_token = None  | 
|
292  | 
if repo_token == '':  | 
|
293  | 
repo_token = None  | 
|
294  | 
try:  | 
|
| 
5200.3.3
by Robert Collins
 Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now  | 
295  | 
repo_token = branch.repository.lock_write(  | 
296  | 
token=repo_token).repository_token  | 
|
| 
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).  | 
297  | 
try:  | 
| 
5200.3.3
by Robert Collins
 Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now  | 
298  | 
branch_token = branch.lock_write(  | 
299  | 
token=branch_token).branch_token  | 
|
| 
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).  | 
300  | 
finally:  | 
| 
3015.2.6
by Robert Collins
 In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.  | 
301  | 
                # 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).  | 
302  | 
branch.repository.unlock()  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
303  | 
except errors.LockContention:  | 
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
304  | 
return FailedSmartServerResponse(('LockContention',))  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
305  | 
except errors.TokenMismatch:  | 
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
306  | 
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.  | 
307  | 
except errors.UnlockableTransport:  | 
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
308  | 
return FailedSmartServerResponse(('UnlockableTransport',))  | 
| 
2872.5.3
by Martin Pool
 Pass back LockFailed from smart server lock methods  | 
309  | 
except errors.LockFailed, e:  | 
310  | 
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.  | 
311  | 
if repo_token is None:  | 
312  | 
repo_token = ''  | 
|
313  | 
else:  | 
|
314  | 
branch.repository.leave_lock_in_place()  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
315  | 
branch.leave_lock_in_place()  | 
316  | 
branch.unlock()  | 
|
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
317  | 
return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))  | 
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
318  | 
|
319  | 
||
320  | 
class SmartServerBranchRequestUnlock(SmartServerBranchRequest):  | 
|
321  | 
||
322  | 
def do_with_branch(self, branch, branch_token, repo_token):  | 
|
323  | 
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).  | 
324  | 
branch.repository.lock_write(token=repo_token)  | 
325  | 
try:  | 
|
326  | 
branch.lock_write(token=branch_token)  | 
|
327  | 
finally:  | 
|
328  | 
branch.repository.unlock()  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
329  | 
except errors.TokenMismatch:  | 
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
330  | 
return FailedSmartServerResponse(('TokenMismatch',))  | 
| 
3015.2.6
by Robert Collins
 In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.  | 
331  | 
if repo_token:  | 
332  | 
branch.repository.dont_leave_lock_in_place()  | 
|
| 
2018.5.79
by Andrew Bennetts
 Implement RemoteBranch.lock_write/unlock as smart operations.  | 
333  | 
branch.dont_leave_lock_in_place()  | 
334  | 
branch.unlock()  | 
|
| 
2432.4.5
by Robert Collins
 Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.  | 
335  | 
return SuccessfulSmartServerResponse(('ok',))  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
336  |