Changeset 1020 in tailor

Timestamp:

11/28/05 17:01:42 (7 years ago)

Author:

lele@…

Hash name:

20051128160142-7a6fb-9ce9878782c1a6bc804296f9a3c09c9ef8b8ac2b

Message:

Possibly use the preferred boring file

File:

• vcpx/darcs.py (modified) (3 diffs)

vcpx/darcs.py

@@ -497 +497 @@
         from dualwd import IGNORED_METADIRS
 
-        if not exists(join(self.basedir, self.repository.METADIR)):
+        metadir = join(self.basedir, '_darcs')
+        prefsdir = join(metadir, 'prefs')
+        prefsname = join(prefsdir, 'prefs')
+        boringname = join(prefsdir, 'boring')
+        if exists(prefsname):
+            for pref in open(prefsname, 'rU'):
+                if pref:
+                    pname, pvalue = pref.split(' ', 1)
+                    if pname == 'boringfile':
+                        boringname = pvalue
+
+        if not exists(metadir):
             cmd = self.repository.command("initialize")
             init = ExternalCommand(cwd=self.basedir, command=cmd)
@@ -506 +517 @@
                     "%s returned status %s" % (str(init), init.exit_status))
 
-            boring = open(join(self.basedir, '_darcs/prefs/boring'), 'rU')
+            boring = open(boringname, 'rU')
             ignored = boring.read().split('\n')
             boring.close()
@@ -529 +540 @@
                 ignored.append('^%s$' % escape(sfrelname+'.journal'))
 
-            boring = open(join(self.basedir, '_darcs/prefs/boring'), 'wU')
+            boring = open(boringname, 'wU')
             boring.write('\n'.join(ignored))
             boring.close()
         else:
-            boring = open(join(self.basedir, '_darcs/prefs/boring'), 'rU')
+            boring = open(boringname, 'rU')
             ignored = boring.read().split('\n')
             boring.close()