mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

implemented action() now, plus some bug fixes

Browse source
This commit is contained in:
Guido van Rossum 1995-04-28 15:26:37 +00:00
parent b07d729c2d
commit 6bb4a51daa
1 changed files with 53 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Demo/pdist/rcvs.py
View file

@ -23,14 +23,59 @@ class MyFile(File):
'A' -- new locally 'A' -- new locally
'R' -- deleted locally 'R' -- deleted locally
'U' -- changed remotely, no changes locally 'U' -- changed remotely, no changes locally
(includes new remotely or deleted remotely)
'M' -- changed locally, no changes remotely 'M' -- changed locally, no changes remotely
'C' -- conflict: changed locally as well as remotely 'C' -- conflict: changed locally as well as remotely
(includes cases where the file has been added (includes cases where the file has been added
or removed locally and remotely) or removed locally and remotely)
'r' -- get rid of entry
'c' -- create entry
'u' -- update entry
""" """
if not self.eseen: if not self.eseen:
pass if not self.lseen:
return '?' if not self.rseen: return '0' # Never heard of
else:
return 'N' # New remotely
else: # self.lseen
if not self.rseen: return '?' # Local only
# Local and remote, but no entry
if self.lsum == self.rsum:
return 'c' # Restore entry only
else: return 'C' # Real conflict
else: # self.eseen
if not self.lseen:
if self.eremoved:
if self.rseen: return 'R' # Removed
else: return 'r' # Get rid of entry
else: # not self.eremoved
if self.rseen:
print "warning:",
print self.file,
print "was lost"
return 'U'
else: return 'r' # Get rid of entry
else: # self.lseen
if not self.rseen:
if self.enew: return 'A' # New locally
else: return 'D' # Deleted remotely
else: # self.rseen
if self.enew:
if self.lsum == self.rsum:
return 'u'
else:
return 'C'
if self.lsum == self.esum:
if self.esum == self.rsum:
return '='
else:
return 'U'
elif self.esum == self.rsum:
return 'M'
elif self.lsum == self.rsum:
return 'u'
else:
return 'C'
def update(self): def update(self):
code = self.action() code = self.action()
@ -127,7 +172,8 @@ class rcvs(CommandFrameWork):
files = [] files = []
if self.cvs.checkfiles(files): if self.cvs.checkfiles(files):
return 1 return 1
self.cvs.report() for file in files:
print self.cvs.entries[file].action(), file
def do_update(self, opts, files): def do_update(self, opts, files):
"""update [file] ...""" """update [file] ..."""
@ -138,6 +184,7 @@ class rcvs(CommandFrameWork):
print "%s: not found" % file print "%s: not found" % file
else: else:
self.cvs.entries[file].update() self.cvs.entries[file].update()
self.cvs.putentries()
def do_commit(self, opts, files): def do_commit(self, opts, files):
"""commit [file] ...""" """commit [file] ..."""
@ -145,13 +192,14 @@ class rcvs(CommandFrameWork):
return 1 return 1
sts = 0 sts = 0
for file in files: for file in files:
if not self.entries[file].commitcheck(): if not self.cvs.entries[file].commitcheck():
sts = 1 sts = 1
if sts: if sts:
return sts return sts
message = raw_input("One-liner: ") message = raw_input("One-liner: ")
for file in files: for file in files:
self.entries[file].commit(message) self.cvs.entries[file].commit(message)
self.cvs.putentries()
def main(): def main():