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 | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 5 | from cvslib import CVS, File |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 6 | import md5 |
| 7 | import os |
| 8 | import string |
| 9 | import sys |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 10 | from cmdfw import CommandFrameWork |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 11 | |
| 12 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 13 | class MyFile(File): |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 14 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 15 | def action(self): |
| 16 | """Return a code indicating the update status of this file. |
| 17 | |
| 18 | The possible return values are: |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 19 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 20 | '=' -- everything's fine |
| 21 | '0' -- file doesn't exist anywhere |
| 22 | '?' -- exists locally only |
| 23 | 'A' -- new locally |
| 24 | 'R' -- deleted locally |
| 25 | 'U' -- changed remotely, no changes locally |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 26 | (includes new remotely or deleted remotely) |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 27 | 'M' -- changed locally, no changes remotely |
| 28 | 'C' -- conflict: changed locally as well as remotely |
| 29 | (includes cases where the file has been added |
| 30 | or removed locally and remotely) |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 31 | 'D' -- deleted remotely |
| 32 | 'N' -- new remotely |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 33 | 'r' -- get rid of entry |
| 34 | 'c' -- create entry |
| 35 | 'u' -- update entry |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 36 | """ |
| 37 | if not self.eseen: |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 38 | if not self.lseen: |
| 39 | if not self.rseen: return '0' # Never heard of |
| 40 | else: |
| 41 | return 'N' # New remotely |
| 42 | else: # self.lseen |
| 43 | if not self.rseen: return '?' # Local only |
| 44 | # Local and remote, but no entry |
| 45 | if self.lsum == self.rsum: |
| 46 | return 'c' # Restore entry only |
| 47 | else: return 'C' # Real conflict |
| 48 | else: # self.eseen |
| 49 | if not self.lseen: |
| 50 | if self.eremoved: |
| 51 | if self.rseen: return 'R' # Removed |
| 52 | else: return 'r' # Get rid of entry |
| 53 | else: # not self.eremoved |
| 54 | if self.rseen: |
| 55 | print "warning:", |
| 56 | print self.file, |
| 57 | print "was lost" |
| 58 | return 'U' |
| 59 | else: return 'r' # Get rid of entry |
| 60 | else: # self.lseen |
| 61 | if not self.rseen: |
| 62 | if self.enew: return 'A' # New locally |
| 63 | else: return 'D' # Deleted remotely |
| 64 | else: # self.rseen |
| 65 | if self.enew: |
| 66 | if self.lsum == self.rsum: |
| 67 | return 'u' |
| 68 | else: |
| 69 | return 'C' |
| 70 | if self.lsum == self.esum: |
| 71 | if self.esum == self.rsum: |
| 72 | return '=' |
| 73 | else: |
| 74 | return 'U' |
| 75 | elif self.esum == self.rsum: |
| 76 | return 'M' |
| 77 | elif self.lsum == self.rsum: |
| 78 | return 'u' |
| 79 | else: |
| 80 | return 'C' |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 81 | |
| 82 | def update(self): |
| 83 | code = self.action() |
| 84 | print code, self.file |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 85 | if code in ('U', 'N'): |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 86 | self.get() |
| 87 | elif code == 'C': |
| 88 | print "%s: conflict resolution not yet implemented" % \ |
| 89 | self.file |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 90 | elif code == 'D': |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 91 | remove(self.file) |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 92 | self.eseen = 0 |
| 93 | elif code == 'r': |
| 94 | self.eseen = 0 |
| 95 | elif code in ('c', 'u'): |
Guido van Rossum | d22f59f | 1995-04-28 15:37:22 +0000 | [diff] [blame] | 96 | self.eseen = 1 |
Guido van Rossum | ba24468 | 1995-04-28 15:33:03 +0000 | [diff] [blame] | 97 | self.erev = self.rrev |
| 98 | self.enew = 0 |
| 99 | self.edeleted = 0 |
| 100 | self.esum = self.rsum |
| 101 | self.emtime, self.ectime = os.stat(self.file)[-2:] |
Guido van Rossum | d22f59f | 1995-04-28 15:37:22 +0000 | [diff] [blame] | 102 | self.extra = '' |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 103 | |
| 104 | def commit(self, message = ""): |
| 105 | code = self.action() |
| 106 | if code in ('A', 'M'): |
| 107 | self.put(message) |
| 108 | elif code == 'R': |
| 109 | print "%s: committing removes not yet implemented" % \ |
| 110 | self.file |
| 111 | elif code == 'C': |
| 112 | print "%s: conflict resolution not yet implemented" % \ |
| 113 | self.file |
| 114 | |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 115 | def diff(self, opts = []): |
Guido van Rossum | 2d2a60e | 1995-04-28 19:24:50 +0000 | [diff] [blame^] | 116 | if self.lsum == self.rsum: |
| 117 | return |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 118 | import tempfile |
| 119 | flags = '' |
| 120 | for o, a in opts: |
| 121 | flags = flags + ' ' + o + a |
| 122 | flags = flags[1:] |
| 123 | fn = self.file |
| 124 | data = self.proxy.get(fn) |
| 125 | tfn = tempfile.mktemp() |
| 126 | try: |
| 127 | tf = open(tfn, 'w') |
| 128 | tf.write(data) |
| 129 | tf.close() |
| 130 | print 'diff %s -r%s %s' % (flags, self.rrev, fn) |
| 131 | sts = os.system('diff %s %s %s' % (flags, tfn, fn)) |
| 132 | if sts: |
| 133 | print '='*70 |
| 134 | finally: |
| 135 | remove(tfn) |
| 136 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 137 | def commitcheck(self): |
| 138 | return self.action() != 'C' |
| 139 | |
| 140 | def put(self, message = ""): |
Guido van Rossum | bafc14d | 1995-04-28 15:41:51 +0000 | [diff] [blame] | 141 | print "Checking in", self.file, "..." |
| 142 | data = open(self.file).read() |
| 143 | messages = self.proxy.put(self.file, data, message) |
| 144 | if messages: |
| 145 | print messages |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 146 | |
| 147 | def get(self): |
| 148 | data = self.proxy.get(self.file) |
| 149 | f = open(self.file, 'w') |
| 150 | f.write(data) |
| 151 | f.close() |
| 152 | self.eseen = 1 |
| 153 | self.esum = self.rsum |
| 154 | self.emtime, self.ectime = os.stat(self.file)[-2:] |
| 155 | self.erev = self.rrev |
| 156 | self.enew = 0 |
| 157 | self.edeleted = 0 |
| 158 | # XXX anything else? |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 159 | |
| 160 | |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 161 | class RCVS(CVS): |
| 162 | |
| 163 | FileClass = MyFile |
| 164 | |
| 165 | def __init__(self): |
| 166 | CVS.__init__(self) |
| 167 | |
| 168 | def checkfiles(self, files): |
| 169 | if not files: |
| 170 | def ok(file, self=self): |
| 171 | e = self.entries[file] |
| 172 | return e.eseen or e.rseen |
| 173 | files[:] = filter(ok, self.entries.keys()) |
| 174 | files.sort() |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 175 | if not files: |
| 176 | print "no files to be processed" |
| 177 | return 1 |
| 178 | else: |
| 179 | return None |
| 180 | else: |
| 181 | sts = None |
| 182 | for file in files: |
| 183 | if not self.entries.has_key(file): |
| 184 | print "%s: nothing known" % file |
| 185 | sts = 1 |
| 186 | return sts |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 187 | |
| 188 | |
| 189 | class rcvs(CommandFrameWork): |
| 190 | |
| 191 | GlobalFlags = 'd:h:p:qv' |
| 192 | UsageMessage = \ |
Guido van Rossum | 2d2a60e | 1995-04-28 19:24:50 +0000 | [diff] [blame^] | 193 | "usage: rcvs [-d directory] [-h host] [-p port] [-q] [-v] [subcommand arg ...]" |
| 194 | PostUsageMessage = \ |
| 195 | "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] | 196 | |
| 197 | def __init__(self): |
| 198 | """Constructor.""" |
| 199 | CommandFrameWork.__init__(self) |
| 200 | self.proxy = None |
| 201 | self.cvs = RCVS() |
| 202 | |
| 203 | def options(self, opts): |
| 204 | self.opts = opts |
| 205 | |
| 206 | def ready(self): |
| 207 | import rcsclient |
| 208 | self.proxy = rcsclient.openrcsclient(self.opts) |
| 209 | self.cvs.setproxy(self.proxy) |
| 210 | self.cvs.getentries() |
| 211 | self.cvs.getlocalfiles() |
| 212 | self.cvs.getremotefiles(self.proxy) |
| 213 | |
| 214 | def default(self): |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 215 | files = [] |
| 216 | if self.cvs.checkfiles(files): |
| 217 | return 1 |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 218 | for file in files: |
| 219 | print self.cvs.entries[file].action(), file |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 220 | |
| 221 | def do_update(self, opts, files): |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 222 | """update [file] ...""" |
| 223 | if self.cvs.checkfiles(files): |
| 224 | return 1 |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 225 | for file in files: |
| 226 | if not self.cvs.entries.has_key(file): |
| 227 | print "%s: not found" % file |
| 228 | else: |
| 229 | self.cvs.entries[file].update() |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 230 | self.cvs.putentries() |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 231 | do_up = do_update |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 232 | |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 233 | def do_commit(self, opts, files): |
| 234 | """commit [file] ...""" |
| 235 | if self.cvs.checkfiles(files): |
| 236 | return 1 |
| 237 | sts = 0 |
| 238 | for file in files: |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 239 | if not self.cvs.entries[file].commitcheck(): |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 240 | sts = 1 |
| 241 | if sts: |
| 242 | return sts |
| 243 | message = raw_input("One-liner: ") |
| 244 | for file in files: |
Guido van Rossum | 6bb4a51 | 1995-04-28 15:26:37 +0000 | [diff] [blame] | 245 | self.cvs.entries[file].commit(message) |
| 246 | self.cvs.putentries() |
Guido van Rossum | 330e884 | 1995-04-28 17:56:32 +0000 | [diff] [blame] | 247 | do_com = do_commit |
| 248 | |
| 249 | def do_diff(self, opts, files): |
| 250 | """diff [difflags] [file] ...""" |
| 251 | if self.cvs.checkfiles(files): |
| 252 | return 1 |
| 253 | for file in files: |
| 254 | self.cvs.entries[file].diff(opts) |
| 255 | do_dif = do_diff |
| 256 | flags_diff = 'cbitwcefhnlrsD:S:' |
| 257 | |
| 258 | |
| 259 | |
| 260 | def remove(fn): |
| 261 | try: |
| 262 | os.unlink(fn) |
| 263 | except os.error: |
| 264 | pass |
Guido van Rossum | ae21ced | 1995-04-28 14:32:26 +0000 | [diff] [blame] | 265 | |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 266 | |
Guido van Rossum | deb627c | 1995-04-27 21:28:53 +0000 | [diff] [blame] | 267 | def main(): |
Guido van Rossum | c218a7e | 1995-04-27 23:33:43 +0000 | [diff] [blame] | 268 | rcvs().run() |
Guido van Rossum | 097c55a | 1995-04-27 18:07:07 +0000 | [diff] [blame] | 269 | |
Guido van Rossum | 5f07b84 | 1995-04-26 22:57:11 +0000 | [diff] [blame] | 270 | |
| 271 | if __name__ == "__main__": |
Guido van Rossum | deb627c | 1995-04-27 21:28:53 +0000 | [diff] [blame] | 272 | main() |