[meld] Support CVSNT as a drop-in replacement for CVS (closes bgo#577930)



commit 25faeee49d1d9eed7eac757b1ee6e5b7c11cc109
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jan 15 07:18:04 2011 +1000

    Support CVSNT as a drop-in replacement for CVS (closes bgo#577930)

 meld/vc/cvs.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
index 14071e0..b612fe5 100644
--- a/meld/vc/cvs.py
+++ b/meld/vc/cvs.py
@@ -30,11 +30,18 @@ import _vc
 
 class Vc(_vc.Vc):
     CMD = "cvs"
+    # CVSNT is a drop-in replacement for CVS; if found, it is used instead
+    ALT_CMD = "cvsnt"
     NAME = "CVS"
     VC_DIR = "CVS"
     VC_ROOT_WALK = False
     PATCH_INDEX_RE = "^Index:(.*)$"
 
+    def __init__(self, location):
+        super(Vc, self).__init__(location)
+        if not _vc.call(["which", self.ALT_CMD]):
+            self.CMD = self.ALT_CMD
+
     def commit_command(self, message):
         return [self.CMD,"commit","-m",message]
     def diff_command(self):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]