← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-04 15:24:27 UTC
  • mto: (2961.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2962.
  • Revision ID: v.ladeuil+lp@free.fr-20071104152427-p9k7e4toywa87wfc
Review feedback.

* doc/en/user-guide/authentication_conf.txt: 
New file. Authentication configuration file documentation.

* doc/en/user-guide/configuration.txt: 
Slight modifications, add authentication.conf reference.

* doc/en/mini-tutorial/index.txt: 
Fix make docs warning.

* doc/developers/authentication-ring.txt: 
Small cleanups noticed during
doc/en/user-guide/authentication_conf.txt redaction.

* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Use a dict() instead of {} syntax.

* bzrlib/tests/blackbox/test_whoami.py:
(TestWhoami.test_whoami_branch): Delete BZREMAIL related tests.

* bzrlib/config.py:
(Config.username): BZREMAIL deleted, has been obsolete for more
than a year.
(AuthenticationConfig.__init__): Review feedback, since keeping a
callback as an attribute is useless, call it now and keep the
filename itself as an attribute.
(AuthenticationConfig.get_credentials): Use a dict() instead of {}
syntax.

* NEWS: 
Updated as per Martin's suggestion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
27
27
 
28
28
 
29
29
class SmartServerBranchRequest(SmartServerRequest):
30
 
    """Base class for handling common branch request logic.
31
 
    """
 
30
    """Base class for handling common branch request logic."""
32
31
 
33
32
    def do(self, path, *args):
34
33
        """Execute a request for a branch at path.
35
 
    
36
 
        All Branch requests take a path to the branch as their first argument.
37
34
 
38
35
        If the branch is a branch reference, NotBranchError is raised.
39
 
 
40
 
        :param path: The path for the repository as received from the
41
 
            client.
42
 
        :return: A SmartServerResponse from self.do_with_branch().
43
36
        """
44
 
        transport = self.transport_from_client_path(path)
 
37
        transport = self._backing_transport.clone(path)
45
38
        bzrdir = BzrDir.open_from_transport(transport)
46
39
        if bzrdir.get_branch_reference() is not None:
47
40
            raise errors.NotBranchError(transport.base)
76
69
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
77
70
    
78
71
    def do_with_branch(self, branch):
79
 
        """Return the content of branch.conf
 
72
        """Return the content of branch.control_files.get('branch.conf').
80
73
        
81
74
        The body is not utf8 decoded - its the literal bytestream from disk.
82
75
        """
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.
88
76
        try:
89
 
            content = branch._transport.get_bytes('branch.conf')
 
77
            content = branch.control_files.get('branch.conf').read()
90
78
        except errors.NoSuchFile:
91
79
            content = ''
92
80
        return SuccessfulSmartServerResponse( ('ok', ), content)
115
103
        return SuccessfulSmartServerResponse(('ok', str(revno), last_revision))
116
104
 
117
105
 
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):
 
106
class SmartServerBranchRequestSetLastRevision(SmartServerLockedBranchRequest):
134
107
    
135
 
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
 
108
    def do_with_locked_branch(self, branch, new_last_revision_id):
136
109
        if new_last_revision_id == 'null:':
137
110
            branch.set_revision_history([])
138
111
        else:
143
116
        return SuccessfulSmartServerResponse(('ok',))
144
117
 
145
118
 
146
 
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
147
 
    
148
 
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id,
149
 
            allow_divergence, allow_overwrite_descendant):
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.
161
 
        :param allow_overwrite_descendant:  A flag.  If zero and
162
 
            new_last_revision_id is not a descendant of the current last
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.
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
170
 
            new_last_revision_id if allow_overwrite_descendant was not set.
171
 
        """
172
 
        do_not_overwrite_descendant = not allow_overwrite_descendant
173
 
        try:
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)
187
 
        except errors.GhostRevisionsHaveNoRevno:
188
 
            return FailedSmartServerResponse(
189
 
                ('NoSuchRevision', new_last_revision_id))
190
 
        return SuccessfulSmartServerResponse(
191
 
            ('ok', new_revno, new_last_revision_id))
192
 
 
193
 
 
194
 
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest):
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
 
    """
200
 
    
201
 
    def do_tip_change_with_locked_branch(self, branch, new_revno,
202
 
            new_last_revision_id):
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))
208
 
        return SuccessfulSmartServerResponse(('ok',))
209
 
 
210
 
 
211
119
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
212
120
    
213
121
    def do_with_branch(self, branch, branch_token='', repo_token=''):
220
128
            try:
221
129
                branch_token = branch.lock_write(token=branch_token)
222
130
            finally:
223
 
                # this leaves the repository with 1 lock
224
131
                branch.repository.unlock()
225
132
        except errors.LockContention:
226
133
            return FailedSmartServerResponse(('LockContention',))
230
137
            return FailedSmartServerResponse(('UnlockableTransport',))
231
138
        except errors.LockFailed, e:
232
139
            return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why)))
233
 
        if repo_token is None:
234
 
            repo_token = ''
235
 
        else:
236
 
            branch.repository.leave_lock_in_place()
 
140
        branch.repository.leave_lock_in_place()
237
141
        branch.leave_lock_in_place()
238
142
        branch.unlock()
239
143
        return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))
250
154
                branch.repository.unlock()
251
155
        except errors.TokenMismatch:
252
156
            return FailedSmartServerResponse(('TokenMismatch',))
253
 
        if repo_token:
254
 
            branch.repository.dont_leave_lock_in_place()
 
157
        branch.repository.dont_leave_lock_in_place()
255
158
        branch.dont_leave_lock_in_place()
256
159
        branch.unlock()
257
160
        return SuccessfulSmartServerResponse(('ok',))