← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Alexander Belchenko
  • Date: 2007-08-10 09:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 2694.
  • Revision ID: bialix@ukr.net-20070810090438-0835xdz0rl8825qv
fixes after Ian's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
128
128
            try:
129
129
                branch_token = branch.lock_write(token=branch_token)
130
130
            finally:
131
 
                # this leaves the repository with 1 lock
132
131
                branch.repository.unlock()
133
132
        except errors.LockContention:
134
133
            return FailedSmartServerResponse(('LockContention',))
136
135
            return FailedSmartServerResponse(('TokenMismatch',))
137
136
        except errors.UnlockableTransport:
138
137
            return FailedSmartServerResponse(('UnlockableTransport',))
139
 
        except errors.LockFailed, e:
140
 
            return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why)))
141
 
        if repo_token is None:
142
 
            repo_token = ''
143
 
        else:
144
 
            branch.repository.leave_lock_in_place()
 
138
        branch.repository.leave_lock_in_place()
145
139
        branch.leave_lock_in_place()
146
140
        branch.unlock()
147
141
        return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))
158
152
                branch.repository.unlock()
159
153
        except errors.TokenMismatch:
160
154
            return FailedSmartServerResponse(('TokenMismatch',))
161
 
        if repo_token:
162
 
            branch.repository.dont_leave_lock_in_place()
 
155
        branch.repository.dont_leave_lock_in_place()
163
156
        branch.dont_leave_lock_in_place()
164
157
        branch.unlock()
165
158
        return SuccessfulSmartServerResponse(('ok',))