← 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: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Server-side branch related request implmentations."""
18
18
 
32
32
 
33
33
    def do(self, path, *args):
34
34
        """Execute a request for a branch at path.
35
 
    
 
35
 
36
36
        All Branch requests take a path to the branch as their first argument.
37
37
 
38
38
        If the branch is a branch reference, NotBranchError is raised.
45
45
        bzrdir = BzrDir.open_from_transport(transport)
46
46
        if bzrdir.get_branch_reference() is not None:
47
47
            raise errors.NotBranchError(transport.base)
48
 
        branch = bzrdir.open_branch()
 
48
        branch = bzrdir.open_branch(ignore_fallbacks=True)
49
49
        return self.do_with_branch(branch, *args)
50
50
 
51
51
 
74
74
 
75
75
 
76
76
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
77
 
    
 
77
 
78
78
    def do_with_branch(self, branch):
79
79
        """Return the content of branch.conf
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.
88
83
        try:
89
84
            content = branch._transport.get_bytes('branch.conf')
90
85
        except errors.NoSuchFile:
92
87
        return SuccessfulSmartServerResponse( ('ok', ), content)
93
88
 
94
89
 
 
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 ''
 
95
        return SuccessfulSmartServerResponse((parent,))
 
96
 
 
97
 
 
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
 
 
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
 
95
142
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
96
143
 
97
144
    def do_with_branch(self, branch):
112
159
 
113
160
 
114
161
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
115
 
    
 
162
 
116
163
    def do_with_branch(self, branch):
117
164
        """Return branch.last_revision_info().
118
 
        
 
165
 
119
166
        The revno is encoded in decimal, the revision_id is encoded as utf8.
120
167
        """
121
168
        revno, last_revision = branch.last_revision_info()
137
184
            return FailedSmartServerResponse(('TipChangeRejected', msg))
138
185
 
139
186
 
 
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
 
140
197
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
141
 
    
 
198
 
142
199
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
143
200
        if new_last_revision_id == 'null:':
144
201
            branch.set_revision_history([])
146
203
            if not branch.repository.has_revision(new_last_revision_id):
147
204
                return FailedSmartServerResponse(
148
205
                    ('NoSuchRevision', new_last_revision_id))
149
 
            branch.generate_revision_history(new_last_revision_id)
 
206
            branch.set_revision_history(branch._lefthand_history(
 
207
                new_last_revision_id, None, None))
150
208
        return SuccessfulSmartServerResponse(('ok',))
151
209
 
152
210
 
153
211
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
154
 
    
 
212
 
155
213
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id,
156
214
            allow_divergence, allow_overwrite_descendant):
157
215
        """Set the last revision of the branch.
158
216
 
159
217
        New in 1.6.
160
 
        
 
218
 
161
219
        :param new_last_revision_id: the revision ID to set as the last
162
220
            revision of the branch.
163
221
        :param allow_divergence: A flag.  If non-zero, change the revision ID
204
262
 
205
263
    New in bzrlib 1.4.
206
264
    """
207
 
    
 
265
 
208
266
    def do_tip_change_with_locked_branch(self, branch, new_revno,
209
267
            new_last_revision_id):
210
268
        try:
215
273
        return SuccessfulSmartServerResponse(('ok',))
216
274
 
217
275
 
 
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
 
218
287
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
219
 
    
 
288
 
220
289
    def do_with_branch(self, branch, branch_token='', repo_token=''):
221
290
        if branch_token == '':
222
291
            branch_token = None
262
331
        branch.dont_leave_lock_in_place()
263
332
        branch.unlock()
264
333
        return SuccessfulSmartServerResponse(('ok',))
265
 
        
 
334