Changeset 72 in tracdarcs

Timestamp:

12/08/07 15:23:16 (5 years ago)

Author:

lele@…

Hash name:

20071208142316-97f81-39c6fe508cbf84ab4a62e7e2270ce7c77eca4022

Message:

Modernize access to the options

Location:

tracdarcs

Files:

• components.py (modified) (3 diffs)
• repository.py (modified) (1 diff)

tracdarcs/components.py

@@ -14 +14 @@
 # Author: Lele Gaifax <lele@metapensiero.it>
 
+from trac.config import BoolOption, Option
 from trac.core import Component, implements
+from trac.db import Table, Column, DatabaseManager
+from trac.env import IEnvironmentSetupParticipant
 from trac.versioncontrol import IRepositoryConnector
-from trac.env import IEnvironmentSetupParticipant
-from trac.db import Table, Column, DatabaseManager
 
 from tracdarcs.repository import DarcsRepository
@@ -24 +25 @@
 
     implements(IRepositoryConnector)
+
+    dont_escape_8bit = BoolOption('darcs', 'dont_escape_8bit', 'false',
+                                  "Avoid darcs automatic escape of non-7bit chars.")
+
+    darcs_command = Option('darcs', 'command', 'darcs',
+                           "Name of the external darcs binary.")
 
     # IRepositoryConnector methods
@@ -34 +41 @@
         """Return a `DarcsRepository`"""
         db = self.env.get_db_cnx()
-        return DarcsRepository( db, dir, self.env.log, self.env.config )
+        darcs = self.darcs_command
+        if self.dont_escape_8bit:
+            darcs = "DARCS_DONT_ESCAPE_8BIT=1 " + darcs
+        return DarcsRepository( db, dir, self.env.log, darcs )
 
 class DarcsSetup(Component):

tracdarcs/repository.py

@@ -101 +101 @@
 
 class DarcsRepository( Repository ) :
-    def __init__( self, db, path, log, config ) :
+    def __init__( self, db, path, log, darcscmd="darcs" ) :
         Repository.__init__( self, path, None, log )
         self.db = db
         self.path = path
         self.log = log
-        self.config = config
-        darcs = config.get('darcs', 'command', 'darcs')
-        if config.get('darcs', 'dont_escape_8bit'):
-            darcs = "DARCS_DONT_ESCAPE_8BIT=1 " + darcs
-        self.__cmd = DarcsCommand( darcs, path, log )
+        self.__cmd = DarcsCommand( darcscmd, path, log )
         # import any new changesets, if any
         update_darcsdb( db, self.__cmd, log )