← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Andrew Bennetts
  • Date: 2009-04-02 05:53:12 UTC
  • mto: This revision was merged to the branch mainline in revision 4242.
  • Revision ID: andrew.bennetts@canonical.com-20090402055312-h7mvgumvm7e620mj
Fix nits in spelling and naming.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
80
80
 
81
81
        The body is not utf8 decoded - its the literal bytestream from disk.
82
82
        """
 
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.
83
88
        try:
84
89
            content = branch._transport.get_bytes('branch.conf')
85
90
        except errors.NoSuchFile:
103
108
        return SuccessfulSmartServerResponse((bytes,))
104
109
 
105
110
 
106
 
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):
107
 
 
108
 
    def __init__(self, backing_transport, root_client_path='/', jail_root=None):
109
 
        SmartServerLockedBranchRequest.__init__(
110
 
            self, backing_transport, root_client_path, jail_root)
111
 
        self.locked = False
112
 
        
113
 
    def do_with_locked_branch(self, branch):
114
 
        """Call _set_tags_bytes for a branch.
115
 
 
116
 
        New in 1.18.
117
 
        """
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()
122
 
        self.locked = True
123
 
 
124
 
    def do_body(self, bytes):
125
 
        self.branch._set_tags_bytes(bytes)
126
 
        return SuccessfulSmartServerResponse(())
127
 
 
128
 
    def do_end(self):
129
 
        # TODO: this request shouldn't have to do this housekeeping manually.
130
 
        # Some of this logic probably belongs in a base class.
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
135
 
        try:
136
 
            return SmartServerLockedBranchRequest.do_end(self)
137
 
        finally:
138
 
            # Only try unlocking if we locked successfully in the first place
139
 
            self.branch.unlock()
140
 
 
141
 
 
142
111
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
143
112
 
144
113
    def do_with_branch(self, branch):
184
153
            return FailedSmartServerResponse(('TipChangeRejected', msg))
185
154
 
186
155
 
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
193
 
        branch._get_config().set_option(value.decode('utf8'), name, section)
194
 
        return SuccessfulSmartServerResponse(())
195
 
 
196
 
 
197
156
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
198
157
 
199
158
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
273
232
        return SuccessfulSmartServerResponse(('ok',))
274
233
 
275
234
 
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
 
 
287
235
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
288
236
 
289
237
    def do_with_branch(self, branch, branch_token='', repo_token=''):
292
240
        if repo_token == '':
293
241
            repo_token = None
294
242
        try:
295
 
            repo_token = branch.repository.lock_write(
296
 
                token=repo_token).repository_token
 
243
            repo_token = branch.repository.lock_write(token=repo_token)
297
244
            try:
298
 
                branch_token = branch.lock_write(
299
 
                    token=branch_token).branch_token
 
245
                branch_token = branch.lock_write(token=branch_token)
300
246
            finally:
301
247
                # this leaves the repository with 1 lock
302
248
                branch.repository.unlock()