blob: f7cdb41a56434d6dc82a54f99223d002d6d7c964 [file] [log] [blame]
Guido van Rossum097c55a1995-04-27 18:07:07 +00001#! /usr/local/bin/python
2
Guido van Rossumc218a7e1995-04-27 23:33:43 +00003"""Remote CVS -- command line interface"""
Guido van Rossum097c55a1995-04-27 18:07:07 +00004
Guido van Rossumd1972af1995-06-21 01:02:06 +00005# XXX To do:
6#
Guido van Rossum903afd01995-06-23 22:33:57 +00007# Bugs:
8# - if the remote file is deleted, "rcvs update" will fail
9#
Guido van Rossumd1972af1995-06-21 01:02:06 +000010# Functionality:
Guido van Rossumd1972af1995-06-21 01:02:06 +000011# - cvs log
Guido van Rossuma79f5a31995-07-18 18:34:34 +000012# - cvs rm
13# - descend into directories (alraedy done for update)
14# - conflict resolution
Guido van Rossumd1972af1995-06-21 01:02:06 +000015# - other relevant commands?
16# - branches
17#
18# - Finesses:
19# - retain file mode's x bits
20# - complain when "nothing known about filename"
21# - edit log message the way CVS lets you edit it
22# - cvs diff -rREVA -rREVB
23# - send mail the way CVS sends it
24#
25# Performance:
26# - cache remote checksums (for every revision ever seen!)
27# - translate symbolic revisions to numeric revisions
28#
29# Reliability:
30# - remote locking
31#
32# Security:
33# - Authenticated RPC?
34
35
Guido van Rossumc218a7e1995-04-27 23:33:43 +000036from cvslib import CVS, File
Guido van Rossum5f07b841995-04-26 22:57:11 +000037import md5
38import os
39import string
40import sys
Guido van Rossumc218a7e1995-04-27 23:33:43 +000041from cmdfw import CommandFrameWork
Guido van Rossum5f07b841995-04-26 22:57:11 +000042
43
Guido van Rossumd1972af1995-06-21 01:02:06 +000044DEF_LOCAL = 1 # Default -l
45
46
Guido van Rossumc218a7e1995-04-27 23:33:43 +000047class MyFile(File):
Guido van Rossum5f07b841995-04-26 22:57:11 +000048
Guido van Rossumae21ced1995-04-28 14:32:26 +000049 def action(self):
50 """Return a code indicating the update status of this file.
51
52 The possible return values are:
Guido van Rossumc218a7e1995-04-27 23:33:43 +000053
Guido van Rossumae21ced1995-04-28 14:32:26 +000054 '=' -- everything's fine
55 '0' -- file doesn't exist anywhere
56 '?' -- exists locally only
57 'A' -- new locally
58 'R' -- deleted locally
59 'U' -- changed remotely, no changes locally
Guido van Rossum6bb4a511995-04-28 15:26:37 +000060 (includes new remotely or deleted remotely)
Guido van Rossumae21ced1995-04-28 14:32:26 +000061 'M' -- changed locally, no changes remotely
62 'C' -- conflict: changed locally as well as remotely
63 (includes cases where the file has been added
64 or removed locally and remotely)
Guido van Rossumba244681995-04-28 15:33:03 +000065 'D' -- deleted remotely
66 'N' -- new remotely
Guido van Rossum6bb4a511995-04-28 15:26:37 +000067 'r' -- get rid of entry
68 'c' -- create entry
69 'u' -- update entry
Guido van Rossum2f7ef911995-05-01 20:22:01 +000070
71 (and probably others :-)
Guido van Rossumae21ced1995-04-28 14:32:26 +000072 """
Guido van Rossumec8cfd41995-05-01 20:06:44 +000073 if not self.lseen:
74 self.getlocal()
75 if not self.rseen:
76 self.getremote()
Guido van Rossumae21ced1995-04-28 14:32:26 +000077 if not self.eseen:
Guido van Rossum2f7ef911995-05-01 20:22:01 +000078 if not self.lsum:
79 if not self.rsum: return '0' # Never heard of
Guido van Rossum6bb4a511995-04-28 15:26:37 +000080 else:
81 return 'N' # New remotely
Guido van Rossum2f7ef911995-05-01 20:22:01 +000082 else: # self.lsum
83 if not self.rsum: return '?' # Local only
Guido van Rossum6bb4a511995-04-28 15:26:37 +000084 # Local and remote, but no entry
85 if self.lsum == self.rsum:
86 return 'c' # Restore entry only
87 else: return 'C' # Real conflict
88 else: # self.eseen
Guido van Rossum2f7ef911995-05-01 20:22:01 +000089 if not self.lsum:
90 if self.edeleted:
91 if self.rsum: return 'R' # Removed
Guido van Rossum6bb4a511995-04-28 15:26:37 +000092 else: return 'r' # Get rid of entry
Guido van Rossum2f7ef911995-05-01 20:22:01 +000093 else: # not self.edeleted
94 if self.rsum:
Guido van Rossum6bb4a511995-04-28 15:26:37 +000095 print "warning:",
96 print self.file,
97 print "was lost"
98 return 'U'
99 else: return 'r' # Get rid of entry
Guido van Rossum2f7ef911995-05-01 20:22:01 +0000100 else: # self.lsum
101 if not self.rsum:
Guido van Rossum6bb4a511995-04-28 15:26:37 +0000102 if self.enew: return 'A' # New locally
103 else: return 'D' # Deleted remotely
Guido van Rossum2f7ef911995-05-01 20:22:01 +0000104 else: # self.rsum
Guido van Rossum6bb4a511995-04-28 15:26:37 +0000105 if self.enew:
106 if self.lsum == self.rsum:
107 return 'u'
108 else:
109 return 'C'
110 if self.lsum == self.esum:
111 if self.esum == self.rsum:
112 return '='
113 else:
114 return 'U'
115 elif self.esum == self.rsum:
116 return 'M'
117 elif self.lsum == self.rsum:
118 return 'u'
119 else:
120 return 'C'
Guido van Rossumae21ced1995-04-28 14:32:26 +0000121
122 def update(self):
123 code = self.action()
Guido van Rossum8b5e0fa1995-04-28 21:48:16 +0000124 if code == '=': return
Guido van Rossumae21ced1995-04-28 14:32:26 +0000125 print code, self.file
Guido van Rossumba244681995-04-28 15:33:03 +0000126 if code in ('U', 'N'):
Guido van Rossumae21ced1995-04-28 14:32:26 +0000127 self.get()
128 elif code == 'C':
129 print "%s: conflict resolution not yet implemented" % \
130 self.file
Guido van Rossumba244681995-04-28 15:33:03 +0000131 elif code == 'D':
Guido van Rossum330e8841995-04-28 17:56:32 +0000132 remove(self.file)
Guido van Rossumba244681995-04-28 15:33:03 +0000133 self.eseen = 0
134 elif code == 'r':
135 self.eseen = 0
136 elif code in ('c', 'u'):
Guido van Rossumd22f59f1995-04-28 15:37:22 +0000137 self.eseen = 1
Guido van Rossumba244681995-04-28 15:33:03 +0000138 self.erev = self.rrev
139 self.enew = 0
140 self.edeleted = 0
141 self.esum = self.rsum
142 self.emtime, self.ectime = os.stat(self.file)[-2:]
Guido van Rossumd22f59f1995-04-28 15:37:22 +0000143 self.extra = ''
Guido van Rossumae21ced1995-04-28 14:32:26 +0000144
145 def commit(self, message = ""):
146 code = self.action()
147 if code in ('A', 'M'):
148 self.put(message)
149 elif code == 'R':
150 print "%s: committing removes not yet implemented" % \
151 self.file
152 elif code == 'C':
153 print "%s: conflict resolution not yet implemented" % \
154 self.file
155
Guido van Rossum330e8841995-04-28 17:56:32 +0000156 def diff(self, opts = []):
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000157 self.action() # To update lseen, rseen
Guido van Rossum330e8841995-04-28 17:56:32 +0000158 flags = ''
Guido van Rossumd1972af1995-06-21 01:02:06 +0000159 rev = self.rrev
160 # XXX should support two rev options too!
Guido van Rossum330e8841995-04-28 17:56:32 +0000161 for o, a in opts:
Guido van Rossumd1972af1995-06-21 01:02:06 +0000162 if o == '-r':
163 rev = a
164 else:
165 flags = flags + ' ' + o + a
166 if rev == self.rrev and self.lsum == self.rsum:
167 return
Guido van Rossum330e8841995-04-28 17:56:32 +0000168 flags = flags[1:]
169 fn = self.file
Guido van Rossumd1972af1995-06-21 01:02:06 +0000170 data = self.proxy.get((fn, rev))
171 sum = md5.new(data).digest()
172 if self.lsum == sum:
173 return
174 import tempfile
Guido van Rossum330e8841995-04-28 17:56:32 +0000175 tfn = tempfile.mktemp()
176 try:
177 tf = open(tfn, 'w')
178 tf.write(data)
179 tf.close()
Guido van Rossumd1972af1995-06-21 01:02:06 +0000180 print 'diff %s -r%s %s' % (flags, rev, fn)
Guido van Rossum330e8841995-04-28 17:56:32 +0000181 sts = os.system('diff %s %s %s' % (flags, tfn, fn))
182 if sts:
183 print '='*70
184 finally:
185 remove(tfn)
186
Guido van Rossumae21ced1995-04-28 14:32:26 +0000187 def commitcheck(self):
188 return self.action() != 'C'
189
190 def put(self, message = ""):
Guido van Rossumbafc14d1995-04-28 15:41:51 +0000191 print "Checking in", self.file, "..."
192 data = open(self.file).read()
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000193 if not self.enew:
194 self.proxy.lock(self.file)
Guido van Rossumbafc14d1995-04-28 15:41:51 +0000195 messages = self.proxy.put(self.file, data, message)
196 if messages:
197 print messages
Guido van Rossum8b5e0fa1995-04-28 21:48:16 +0000198 self.setentry(self.proxy.head(self.file), self.lsum)
Guido van Rossumae21ced1995-04-28 14:32:26 +0000199
200 def get(self):
201 data = self.proxy.get(self.file)
202 f = open(self.file, 'w')
203 f.write(data)
204 f.close()
Guido van Rossum8b5e0fa1995-04-28 21:48:16 +0000205 self.setentry(self.rrev, self.rsum)
206
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000207 def add(self):
208 self.eseen = 0 # While we're hacking...
209 self.esum = self.lsum
210 self.emtime, self.ectime = 0, 0
211 self.erev = ''
212 self.enew = 1
213 self.edeleted = 0
214 self.eseen = 1 # Done
215 self.extra = ''
216
Guido van Rossum8b5e0fa1995-04-28 21:48:16 +0000217 def setentry(self, erev, esum):
218 self.eseen = 0 # While we're hacking...
219 self.esum = esum
Guido van Rossumae21ced1995-04-28 14:32:26 +0000220 self.emtime, self.ectime = os.stat(self.file)[-2:]
Guido van Rossum8b5e0fa1995-04-28 21:48:16 +0000221 self.erev = erev
Guido van Rossumae21ced1995-04-28 14:32:26 +0000222 self.enew = 0
223 self.edeleted = 0
Guido van Rossum8b5e0fa1995-04-28 21:48:16 +0000224 self.eseen = 1 # Done
Guido van Rossumd1972af1995-06-21 01:02:06 +0000225 self.extra = ''
226
227
228SENDMAIL = "/usr/lib/sendmail -t"
229MAILFORM = """To: %s
230Subject: CVS changes: %s
231
232...Message from rcvs...
233
234Committed files:
235 %s
236
237Log message:
238 %s
239"""
Guido van Rossum5f07b841995-04-26 22:57:11 +0000240
241
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000242class RCVS(CVS):
243
244 FileClass = MyFile
245
246 def __init__(self):
247 CVS.__init__(self)
248
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000249 def update(self, files):
250 for e in self.whichentries(files, 1):
251 e.update()
252
253 def commit(self, files, message = ""):
254 list = self.whichentries(files)
Guido van Rossumd1972af1995-06-21 01:02:06 +0000255 if not list: return
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000256 ok = 1
257 for e in list:
258 if not e.commitcheck():
259 ok = 0
260 if not ok:
261 print "correct above errors first"
262 return
263 if not message:
264 message = raw_input("One-liner: ")
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000265 committed = []
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000266 for e in list:
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000267 committed.append(e.file)
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000268 e.commit(message)
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000269 self.mailinfo(committed, message)
Guido van Rossumd1972af1995-06-21 01:02:06 +0000270
271 def mailinfo(self, files, message = ""):
272 towhom = "sjoerd@cwi.nl, jack@cwi.nl" # XXX
273 mailtext = MAILFORM % (towhom, string.join(files),
274 string.join(files), message)
275 print '-'*70
276 print mailtext
277 print '-'*70
278 ok = raw_input("OK to mail to %s? " % towhom)
279 if string.lower(string.strip(ok)) in ('y', 'ye', 'yes'):
280 p = os.popen(SENDMAIL, "w")
281 p.write(mailtext)
282 sts = p.close()
283 if sts:
284 print "Sendmail exit status %s" % str(sts)
285 else:
286 print "Mail sent."
287 else:
288 print "No mail sent."
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000289
290 def report(self, files):
291 for e in self.whichentries(files):
292 e.report()
293
294 def diff(self, files, opts):
295 for e in self.whichentries(files):
296 e.diff(opts)
297
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000298 def add(self, files):
299 if not files:
300 raise RuntimeError, "'cvs add' needs at least one file"
301 list = []
302 for e in self.whichentries(files, 1):
303 code = e.action()
304 print code, e.file
305 e.report()
306 e.add()
307 code = e.action()
308 print code, e.file
309 e.report()
310 print '='*20
311
312 def rm(self, files):
313 if not files:
314 raise RuntimeError, "'cvs rm' needs at least one file"
315 raise RuntimeError, "'cvs rm' not yet imlemented"
316
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000317 def whichentries(self, files, localfilestoo = 0):
318 if files:
319 list = []
Guido van Rossumae21ced1995-04-28 14:32:26 +0000320 for file in files:
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000321 if self.entries.has_key(file):
322 e = self.entries[file]
323 else:
324 e = self.FileClass(file)
325 self.entries[file] = e
326 list.append(e)
327 else:
328 list = self.entries.values()
329 for file in self.proxy.listfiles():
330 if self.entries.has_key(file):
331 continue
332 e = self.FileClass(file)
333 self.entries[file] = e
334 list.append(e)
335 if localfilestoo:
336 for file in os.listdir(os.curdir):
337 if not self.entries.has_key(file) \
338 and not self.ignored(file):
339 e = self.FileClass(file)
340 self.entries[file] = e
341 list.append(e)
342 list.sort()
343 if self.proxy:
344 for e in list:
345 if e.proxy is None:
346 e.proxy = self.proxy
347 return list
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000348
349
350class rcvs(CommandFrameWork):
351
Guido van Rossum903afd01995-06-23 22:33:57 +0000352 GlobalFlags = 'd:h:p:qvL'
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000353 UsageMessage = \
Guido van Rossum2d2a60e1995-04-28 19:24:50 +0000354"usage: rcvs [-d directory] [-h host] [-p port] [-q] [-v] [subcommand arg ...]"
355 PostUsageMessage = \
356 "If no subcommand is given, the status of all files is listed"
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000357
358 def __init__(self):
359 """Constructor."""
360 CommandFrameWork.__init__(self)
361 self.proxy = None
362 self.cvs = RCVS()
363
Guido van Rossumd1972af1995-06-21 01:02:06 +0000364 def recurse(self):
365 if self.proxy:
366 self.proxy._close()
367 self.proxy = None
368 names = os.listdir(os.curdir)
369 for name in names:
370 if name == os.curdir or name == os.pardir:
371 continue
372 if name == "CVS":
373 continue
374 if not os.path.isdir(name):
375 continue
376 if os.path.islink(name):
377 continue
378 print "--- entering subdirectory", name, "---"
379 os.chdir(name)
380 try:
381 if os.path.isdir("CVS"):
382 self.__class__().run()
383 else:
384 self.recurse()
385 finally:
386 os.chdir(os.pardir)
387 print "--- left subdirectory", name, "---"
388
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000389 def options(self, opts):
390 self.opts = opts
391
392 def ready(self):
393 import rcsclient
394 self.proxy = rcsclient.openrcsclient(self.opts)
395 self.cvs.setproxy(self.proxy)
396 self.cvs.getentries()
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000397
398 def default(self):
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000399 self.cvs.report([])
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000400
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000401 def do_report(self, opts, files):
402 self.cvs.report(files)
403
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000404 def do_update(self, opts, files):
Guido van Rossumd1972af1995-06-21 01:02:06 +0000405 """update [-l] [-R] [file] ..."""
406 local = DEF_LOCAL
407 for o, a in opts:
408 if o == '-l': local = 1
409 if o == '-R': local = 0
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000410 self.cvs.update(files)
Guido van Rossum6bb4a511995-04-28 15:26:37 +0000411 self.cvs.putentries()
Guido van Rossumd1972af1995-06-21 01:02:06 +0000412 if not local and not files:
413 self.recurse()
414 flags_update = '-lR'
Guido van Rossum330e8841995-04-28 17:56:32 +0000415 do_up = do_update
Guido van Rossumd1972af1995-06-21 01:02:06 +0000416 flags_up = flags_update
Guido van Rossum5f07b841995-04-26 22:57:11 +0000417
Guido van Rossumae21ced1995-04-28 14:32:26 +0000418 def do_commit(self, opts, files):
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000419 """commit [-m message] [file] ..."""
420 message = ""
421 for o, a in opts:
422 if o == '-m': message = a
423 self.cvs.commit(files, message)
Guido van Rossum6bb4a511995-04-28 15:26:37 +0000424 self.cvs.putentries()
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000425 flags_commit = 'm:'
Guido van Rossumd1972af1995-06-21 01:02:06 +0000426 do_com = do_commit
427 flags_com = flags_commit
Guido van Rossum330e8841995-04-28 17:56:32 +0000428
429 def do_diff(self, opts, files):
430 """diff [difflags] [file] ..."""
Guido van Rossumec8cfd41995-05-01 20:06:44 +0000431 self.cvs.diff(files, opts)
Guido van Rossumd1972af1995-06-21 01:02:06 +0000432 flags_diff = 'cbitwcefhnlr:sD:S:'
Guido van Rossum330e8841995-04-28 17:56:32 +0000433 do_dif = do_diff
Guido van Rossumd1972af1995-06-21 01:02:06 +0000434 flags_dif = flags_diff
Guido van Rossum330e8841995-04-28 17:56:32 +0000435
Guido van Rossuma79f5a31995-07-18 18:34:34 +0000436 def do_add(self, opts, files):
437 """add file ..."""
438 if not files:
439 print "'rcvs add' requires at least one file"
440 return
441 self.cvs.add(files)
442 self.cvs.putentries()
443
444 def do_remove(self, opts, files):
445 """remove file ..."""
446 if not files:
447 print "'rcvs remove' requires at least one file"
448 return
449 self.cvs.remove(files)
450 self.cvs.putentries()
451 do_rm = do_remove
452
453
Guido van Rossum330e8841995-04-28 17:56:32 +0000454
455
456def remove(fn):
457 try:
458 os.unlink(fn)
459 except os.error:
460 pass
Guido van Rossumae21ced1995-04-28 14:32:26 +0000461
Guido van Rossum5f07b841995-04-26 22:57:11 +0000462
Guido van Rossumdeb627c1995-04-27 21:28:53 +0000463def main():
Guido van Rossumc218a7e1995-04-27 23:33:43 +0000464 rcvs().run()
Guido van Rossum097c55a1995-04-27 18:07:07 +0000465
Guido van Rossum5f07b841995-04-26 22:57:11 +0000466
467if __name__ == "__main__":
Guido van Rossumdeb627c1995-04-27 21:28:53 +0000468 main()