newer monotone has changed and wont get recognized

[ronny]

monotone v0.26 and later are incombatible to earlyer versions - they use a new directory-sheme

[ronny (ronny-pfannschmidt-deactivatedaccount)]

=== modified file 'pida/utils/vc/monotone.py'
--- pida/utils/vc/monotone.py
+++ pida/utils/vc/monotone.py
@@ -23,24 +23,39 @@
 ### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import os
-import re
-import time
 import _vc

 class Vc(_vc.Vc):
- CMD = "monotone"
+ CMD = "mtn"
     NAME = "Monotone"
     PATCH_STRIP_NUM = 0
     PATCH_INDEX_RE = "^[+]{3,3} ([^ ]*)\t[0-9a-f]{40,40}$"

     def __init__(self, location):
         self._tree_cache = None
- while location != "/":
- if os.path.isdir( "%s/MT" % location):
- self.root = location
- return
- location = os.path.dirname(location)
+ location = os.path.normpath(location)
+
+ def find_folder(where, tofind):
+ while where != "/":
+ cur = os.path.join(where,tofind)
+ if os.path.isdir(cur):
+ return where
+ where = os.path.dirname(where)
+
+ # for monotone >= 0.26
+ mtn = find_folder(location,"_MTN")
+ if mtn:
+ self.root = mtn
+ return
+
+ # for monotone <= 0.25 (different metadata directory, different executable)
+ mt = find_folder(location,"MT")
+ if mt:
+ self.root = mt
+ self.CMD = "monotone"
+ return
+
         raise ValueError

     def commit_command(self, message):
@@ -69,7 +84,7 @@
     def lookup_tree(self):
         while 1:
             try:
- entries = os.popen("monotone automate inventory").read().split("\n")[:-1]
+ entries = os.popen("cd %s && %s automate inventory"%(self.root,self.CMD)).read().split("\n")[:-1]
                 break
             except OSError, e:
                 if e.errno != errno.EAGAIN:

[ronny (ronny-pfannschmidt-deactivatedaccount)]

made this by from the updated vc/monotone.py of meld, and fixing a problem with the working dir

monotone ppl might add a switch to monotone for a more portable version ( actually it relies on popen using a shell wich wont run on windows )

[Ali Afshar (aafshar)]

0.4.0