[Csp-commits] svn:csp r1329 - trunk/CSP/tools

[<sv...@ww...>]

Author: mkrose
Date: 2004-11-21 12:16:27 -0800 (Sun, 21 Nov 2004)
New Revision: 1329

Modified:
   trunk/CSP/tools/subcmd.py
   trunk/CSP/tools/sublib.py
Log:
Add support for files marked as 'replaced'.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1329

Modified: trunk/CSP/tools/subcmd.py
===================================================================
--- trunk/CSP/tools/subcmd.py	2004-11-21 20:13:14 UTC (rev 1328)
+++ trunk/CSP/tools/subcmd.py	2004-11-21 20:16:27 UTC (rev 1329)
@@ -122,6 +122,7 @@
     sublib.File.ADD: 'add',
     sublib.File.DEL: 'delete',
     sublib.File.MOD: 'modified',
+    sublib.File.REP: 'replaced',
     sublib.File.CONFLICT: 'XXX conflict',
   }
 

Modified: trunk/CSP/tools/sublib.py
===================================================================
--- trunk/CSP/tools/sublib.py	2004-11-21 20:13:14 UTC (rev 1328)
+++ trunk/CSP/tools/sublib.py	2004-11-21 20:16:27 UTC (rev 1329)
@@ -37,6 +37,7 @@
   ADD = 'ADD'
   DEL = 'DEL'
   MOD = 'MOD'
+  REP = 'REP'
   CONFLICT = 'CON'
 
   def __init__(self, path, root, mode):
@@ -83,6 +84,7 @@
     if line.startswith('M'): mode = File.MOD
     elif line.startswith('A'): mode = File.ADD
     elif line.startswith('D'): mode = File.DEL
+    elif line.startswith('R'): mode = File.REP
     elif line.startswith('C'): mode = File.CONFLICT
     else: continue
     files.append(File(relpath, root, mode))