Guido van Rossum | 097c55a | 1995-04-27 18:07:07 +0000 | [diff] [blame] | 1 | #! /usr/local/bin/python |
| 2 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 3 | """Remote CVS -- command line interface""" |
Guido van Rossum | 097c55a | 1995-04-27 18:07:07 +0000 | [diff] [blame] | 4 | |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 5 | # XXX To do: |
| 6 | # |
| 7 | # Functionality: |
| 8 | # - descend into directories |
| 9 | # - cvs add; cvs rm |
| 10 | # - commit new files |
| 11 | # - conflict resolution |
| 12 | # - cvs log |
| 13 | # - other relevant commands? |
| 14 | # - branches |
| 15 | # |
| 16 | # - Finesses: |
| 17 | # - retain file mode's x bits |
| 18 | # - complain when "nothing known about filename" |
| 19 | # - edit log message the way CVS lets you edit it |
| 20 | # - cvs diff -rREVA -rREVB |
| 21 | # - send mail the way CVS sends it |
| 22 | # |
| 23 | # Performance: |
| 24 | # - cache remote checksums (for every revision ever seen!) |
| 25 | # - translate symbolic revisions to numeric revisions |
| 26 | # |
| 27 | # Reliability: |
| 28 | # - remote locking |
| 29 | # |
| 30 | # Security: |
| 31 | # - Authenticated RPC? |
| 32 | |
| 33 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 34 | from cvslib import CVS, File |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 35 | import md5 |
| 36 | import os |
| 37 | import string |
| 38 | import sys |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 39 | from cmdfw import CommandFrameWork |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 40 | |
| 41 | |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 42 | DEF_LOCAL = 1 # Default -l |
| 43 | |
| 44 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 45 | class MyFile(File): |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 46 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 47 | def action(self): |
| 48 | """Return a code indicating the update status of this file. |
| 49 | |
| 50 | The possible return values are: |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 51 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 52 | '=' -- everything's fine |
| 53 | '0' -- file doesn't exist anywhere |
| 54 | '?' -- exists locally only |
| 55 | 'A' -- new locally |
| 56 | 'R' -- deleted locally |
| 57 | 'U' -- changed remotely, no changes locally |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 58 | (includes new remotely or deleted remotely) |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 59 | 'M' -- changed locally, no changes remotely |
| 60 | 'C' -- conflict: changed locally as well as remotely |
| 61 | (includes cases where the file has been added |
| 62 | or removed locally and remotely) |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 63 | 'D' -- deleted remotely |
| 64 | 'N' -- new remotely |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 65 | 'r' -- get rid of entry |
| 66 | 'c' -- create entry |
| 67 | 'u' -- update entry |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 68 | |
| 69 | (and probably others :-) |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 70 | """ |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 71 | if not self.lseen: |
| 72 | self.getlocal() |
| 73 | if not self.rseen: |
| 74 | self.getremote() |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 75 | if not self.eseen: |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 76 | if not self.lsum: |
| 77 | if not self.rsum: return '0' # Never heard of |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 78 | else: |
| 79 | return 'N' # New remotely |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 80 | else: # self.lsum |
| 81 | if not self.rsum: return '?' # Local only |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 82 | # Local and remote, but no entry |
| 83 | if self.lsum == self.rsum: |
| 84 | return 'c' # Restore entry only |
| 85 | else: return 'C' # Real conflict |
| 86 | else: # self.eseen |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 87 | if not self.lsum: |
| 88 | if self.edeleted: |
| 89 | if self.rsum: return 'R' # Removed |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 90 | else: return 'r' # Get rid of entry |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 91 | else: # not self.edeleted |
| 92 | if self.rsum: |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 93 | print "warning:", |
| 94 | print self.file, |
| 95 | print "was lost" |
| 96 | return 'U' |
| 97 | else: return 'r' # Get rid of entry |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 98 | else: # self.lsum |
| 99 | if not self.rsum: |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 100 | if self.enew: return 'A' # New locally |
| 101 | else: return 'D' # Deleted remotely |
Guido van Rossum | 2f7ef91 | 1995-05-01 20:22:01 +0000 | [diff] [blame] | 102 | else: # self.rsum |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 103 | if self.enew: |
| 104 | if self.lsum == self.rsum: |
| 105 | return 'u' |
| 106 | else: |
| 107 | return 'C' |
| 108 | if self.lsum == self.esum: |
| 109 | if self.esum == self.rsum: |
| 110 | return '=' |
| 111 | else: |
| 112 | return 'U' |
| 113 | elif self.esum == self.rsum: |
| 114 | return 'M' |
| 115 | elif self.lsum == self.rsum: |
| 116 | return 'u' |
| 117 | else: |
| 118 | return 'C' |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 119 | |
| 120 | def update(self): |
| 121 | code = self.action() |
Guido van Rossum | 8b5e0fa | 1995-04-28 21:48:16 +0000 | [diff] [blame] | 122 | if code == '=': return |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 123 | print code, self.file |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 124 | if code in ('U', 'N'): |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 125 | self.get() |
| 126 | elif code == 'C': |
| 127 | print "%s: conflict resolution not yet implemented" % \ |
| 128 | self.file |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 129 | elif code == 'D': |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 130 | remove(self.file) |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 131 | self.eseen = 0 |
| 132 | elif code == 'r': |
| 133 | self.eseen = 0 |
| 134 | elif code in ('c', 'u'): |
Guido van Rossum | d22f59f | 1995-04-28 15:37:22 +0000 | [diff] [blame] | 135 | self.eseen = 1 |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 136 | self.erev = self.rrev |
| 137 | self.enew = 0 |
| 138 | self.edeleted = 0 |
| 139 | self.esum = self.rsum |
| 140 | self.emtime, self.ectime = os.stat(self.file)[-2:] |
Guido van Rossum | d22f59f | 1995-04-28 15:37:22 +0000 | [diff] [blame] | 141 | self.extra = '' |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 142 | |
| 143 | def commit(self, message = ""): |
| 144 | code = self.action() |
| 145 | if code in ('A', 'M'): |
| 146 | self.put(message) |
| 147 | elif code == 'R': |
| 148 | print "%s: committing removes not yet implemented" % \ |
| 149 | self.file |
| 150 | elif code == 'C': |
| 151 | print "%s: conflict resolution not yet implemented" % \ |
| 152 | self.file |
| 153 | |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 154 | def diff(self, opts = []): |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 155 | self.action() # To update lseen, rseen |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 156 | flags = '' |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 157 | rev = self.rrev |
| 158 | # XXX should support two rev options too! |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 159 | for o, a in opts: |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 160 | if o == '-r': |
| 161 | rev = a |
| 162 | else: |
| 163 | flags = flags + ' ' + o + a |
| 164 | if rev == self.rrev and self.lsum == self.rsum: |
| 165 | return |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 166 | flags = flags[1:] |
| 167 | fn = self.file |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 168 | data = self.proxy.get((fn, rev)) |
| 169 | sum = md5.new(data).digest() |
| 170 | if self.lsum == sum: |
| 171 | return |
| 172 | import tempfile |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 173 | tfn = tempfile.mktemp() |
| 174 | try: |
| 175 | tf = open(tfn, 'w') |
| 176 | tf.write(data) |
| 177 | tf.close() |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 178 | print 'diff %s -r%s %s' % (flags, rev, fn) |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 179 | sts = os.system('diff %s %s %s' % (flags, tfn, fn)) |
| 180 | if sts: |
| 181 | print '='*70 |
| 182 | finally: |
| 183 | remove(tfn) |
| 184 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 185 | def commitcheck(self): |
| 186 | return self.action() != 'C' |
| 187 | |
| 188 | def put(self, message = ""): |
Guido van Rossum | bafc14d | 1995-04-28 15:41:51 +0000 | [diff] [blame] | 189 | print "Checking in", self.file, "..." |
| 190 | data = open(self.file).read() |
| 191 | messages = self.proxy.put(self.file, data, message) |
| 192 | if messages: |
| 193 | print messages |
Guido van Rossum | 8b5e0fa | 1995-04-28 21:48:16 +0000 | [diff] [blame] | 194 | self.setentry(self.proxy.head(self.file), self.lsum) |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 195 | |
| 196 | def get(self): |
| 197 | data = self.proxy.get(self.file) |
| 198 | f = open(self.file, 'w') |
| 199 | f.write(data) |
| 200 | f.close() |
Guido van Rossum | 8b5e0fa | 1995-04-28 21:48:16 +0000 | [diff] [blame] | 201 | self.setentry(self.rrev, self.rsum) |
| 202 | |
| 203 | def setentry(self, erev, esum): |
| 204 | self.eseen = 0 # While we're hacking... |
| 205 | self.esum = esum |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 206 | self.emtime, self.ectime = os.stat(self.file)[-2:] |
Guido van Rossum | 8b5e0fa | 1995-04-28 21:48:16 +0000 | [diff] [blame] | 207 | self.erev = erev |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 208 | self.enew = 0 |
| 209 | self.edeleted = 0 |
Guido van Rossum | 8b5e0fa | 1995-04-28 21:48:16 +0000 | [diff] [blame] | 210 | self.eseen = 1 # Done |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 211 | self.extra = '' |
| 212 | |
| 213 | |
| 214 | SENDMAIL = "/usr/lib/sendmail -t" |
| 215 | MAILFORM = """To: %s |
| 216 | Subject: CVS changes: %s |
| 217 | |
| 218 | ...Message from rcvs... |
| 219 | |
| 220 | Committed files: |
| 221 | %s |
| 222 | |
| 223 | Log message: |
| 224 | %s |
| 225 | """ |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 226 | |
| 227 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 228 | class RCVS(CVS): |
| 229 | |
| 230 | FileClass = MyFile |
| 231 | |
| 232 | def __init__(self): |
| 233 | CVS.__init__(self) |
| 234 | |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 235 | def update(self, files): |
| 236 | for e in self.whichentries(files, 1): |
| 237 | e.update() |
| 238 | |
| 239 | def commit(self, files, message = ""): |
| 240 | list = self.whichentries(files) |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 241 | if not list: return |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 242 | ok = 1 |
| 243 | for e in list: |
| 244 | if not e.commitcheck(): |
| 245 | ok = 0 |
| 246 | if not ok: |
| 247 | print "correct above errors first" |
| 248 | return |
| 249 | if not message: |
| 250 | message = raw_input("One-liner: ") |
| 251 | for e in list: |
| 252 | e.commit(message) |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 253 | self.mailinfo(files, message) |
| 254 | |
| 255 | def mailinfo(self, files, message = ""): |
| 256 | towhom = "sjoerd@cwi.nl, jack@cwi.nl" # XXX |
| 257 | mailtext = MAILFORM % (towhom, string.join(files), |
| 258 | string.join(files), message) |
| 259 | print '-'*70 |
| 260 | print mailtext |
| 261 | print '-'*70 |
| 262 | ok = raw_input("OK to mail to %s? " % towhom) |
| 263 | if string.lower(string.strip(ok)) in ('y', 'ye', 'yes'): |
| 264 | p = os.popen(SENDMAIL, "w") |
| 265 | p.write(mailtext) |
| 266 | sts = p.close() |
| 267 | if sts: |
| 268 | print "Sendmail exit status %s" % str(sts) |
| 269 | else: |
| 270 | print "Mail sent." |
| 271 | else: |
| 272 | print "No mail sent." |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 273 | |
| 274 | def report(self, files): |
| 275 | for e in self.whichentries(files): |
| 276 | e.report() |
| 277 | |
| 278 | def diff(self, files, opts): |
| 279 | for e in self.whichentries(files): |
| 280 | e.diff(opts) |
| 281 | |
| 282 | def whichentries(self, files, localfilestoo = 0): |
| 283 | if files: |
| 284 | list = [] |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 285 | for file in files: |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 286 | if self.entries.has_key(file): |
| 287 | e = self.entries[file] |
| 288 | else: |
| 289 | e = self.FileClass(file) |
| 290 | self.entries[file] = e |
| 291 | list.append(e) |
| 292 | else: |
| 293 | list = self.entries.values() |
| 294 | for file in self.proxy.listfiles(): |
| 295 | if self.entries.has_key(file): |
| 296 | continue |
| 297 | e = self.FileClass(file) |
| 298 | self.entries[file] = e |
| 299 | list.append(e) |
| 300 | if localfilestoo: |
| 301 | for file in os.listdir(os.curdir): |
| 302 | if not self.entries.has_key(file) \ |
| 303 | and not self.ignored(file): |
| 304 | e = self.FileClass(file) |
| 305 | self.entries[file] = e |
| 306 | list.append(e) |
| 307 | list.sort() |
| 308 | if self.proxy: |
| 309 | for e in list: |
| 310 | if e.proxy is None: |
| 311 | e.proxy = self.proxy |
| 312 | return list |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 313 | |
| 314 | |
| 315 | class rcvs(CommandFrameWork): |
| 316 | |
| 317 | GlobalFlags = 'd:h:p:qv' |
| 318 | UsageMessage = \ |
Guido van Rossum | 2d2a60e | 1995-04-28 19:24:50 +0000 | [diff] [blame] | 319 | "usage: rcvs [-d directory] [-h host] [-p port] [-q] [-v] [subcommand arg ...]" |
| 320 | PostUsageMessage = \ |
| 321 | "If no subcommand is given, the status of all files is listed" |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 322 | |
| 323 | def __init__(self): |
| 324 | """Constructor.""" |
| 325 | CommandFrameWork.__init__(self) |
| 326 | self.proxy = None |
| 327 | self.cvs = RCVS() |
| 328 | |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 329 | def recurse(self): |
| 330 | if self.proxy: |
| 331 | self.proxy._close() |
| 332 | self.proxy = None |
| 333 | names = os.listdir(os.curdir) |
| 334 | for name in names: |
| 335 | if name == os.curdir or name == os.pardir: |
| 336 | continue |
| 337 | if name == "CVS": |
| 338 | continue |
| 339 | if not os.path.isdir(name): |
| 340 | continue |
| 341 | if os.path.islink(name): |
| 342 | continue |
| 343 | print "--- entering subdirectory", name, "---" |
| 344 | os.chdir(name) |
| 345 | try: |
| 346 | if os.path.isdir("CVS"): |
| 347 | self.__class__().run() |
| 348 | else: |
| 349 | self.recurse() |
| 350 | finally: |
| 351 | os.chdir(os.pardir) |
| 352 | print "--- left subdirectory", name, "---" |
| 353 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 354 | def options(self, opts): |
| 355 | self.opts = opts |
| 356 | |
| 357 | def ready(self): |
| 358 | import rcsclient |
| 359 | self.proxy = rcsclient.openrcsclient(self.opts) |
| 360 | self.cvs.setproxy(self.proxy) |
| 361 | self.cvs.getentries() |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 362 | |
| 363 | def default(self): |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 364 | self.cvs.report([]) |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 365 | |
| 366 | def do_update(self, opts, files): |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 367 | """update [-l] [-R] [file] ...""" |
| 368 | local = DEF_LOCAL |
| 369 | for o, a in opts: |
| 370 | if o == '-l': local = 1 |
| 371 | if o == '-R': local = 0 |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 372 | self.cvs.update(files) |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 373 | self.cvs.putentries() |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 374 | if not local and not files: |
| 375 | self.recurse() |
| 376 | flags_update = '-lR' |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 377 | do_up = do_update |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 378 | flags_up = flags_update |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 379 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 380 | def do_commit(self, opts, files): |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 381 | """commit [-m message] [file] ...""" |
| 382 | message = "" |
| 383 | for o, a in opts: |
| 384 | if o == '-m': message = a |
| 385 | self.cvs.commit(files, message) |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 386 | self.cvs.putentries() |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 387 | flags_commit = 'm:' |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 388 | do_com = do_commit |
| 389 | flags_com = flags_commit |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 390 | |
| 391 | def do_diff(self, opts, files): |
| 392 | """diff [difflags] [file] ...""" |
Guido van Rossum | ec8cfd4 | 1995-05-01 20:06:44 +0000 | [diff] [blame] | 393 | self.cvs.diff(files, opts) |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 394 | flags_diff = 'cbitwcefhnlr:sD:S:' |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 395 | do_dif = do_diff |
Guido van Rossum | d1972af | 1995-06-21 01:02:06 +0000 | [diff] [blame^] | 396 | flags_dif = flags_diff |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 397 | |
| 398 | |
| 399 | |
| 400 | def remove(fn): |
| 401 | try: |
| 402 | os.unlink(fn) |
| 403 | except os.error: |
| 404 | pass |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 405 | |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 406 | |
Guido van Rossum | deb627c | 1995-04-27 21:28:53 +0000 | [diff] [blame] | 407 | def main(): |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 408 | rcvs().run() |
Guido van Rossum | 097c55a | 1995-04-27 18:07:07 +0000 | [diff] [blame] | 409 | |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 410 | |
| 411 | if __name__ == "__main__": |
Guido van Rossum | deb627c | 1995-04-27 21:28:53 +0000 | [diff] [blame] | 412 | main() |