meld r1250 - trunk/vc

[vincele svn gnome org]

Author: vincele
Date: Tue Mar 10 23:44:06 2009
New Revision: 1250
URL: http://svn.gnome.org/viewvc/meld?rev=1250&view=rev

Log:
Go to VC root directory before calling mtn automate inventory

Fix the following backtrace when calling meld from outside repository:

Traceback (most recent call last):
  File "/home/vince/dev/svn/meld/trunk/task.py", line 130, in iteration
    ret = task()
  File "/home/vince/dev/svn/meld/trunk/vcview.py", line 254, in _search_recursively_iter
    self.vc.cache_inventory(rootname)
  File "/home/vince/dev/svn/meld/trunk/vc/monotone.py", line 70, in cache_inventory
    self._tree_cache = self.lookup_tree()
  File "/home/vince/dev/svn/meld/trunk/vc/monotone.py", line 122, in lookup_tree
    fname = stanza['path'][0]
KeyError: 'path'



Modified:
   trunk/vc/monotone.py

Modified: trunk/vc/monotone.py
==============================================================================
--- trunk/vc/monotone.py	(original)
+++ trunk/vc/monotone.py	Tue Mar 10 23:44:06 2009
@@ -75,7 +75,8 @@
     def lookup_tree(self):
         while 1:
             try:
-                entries = os.popen(self.CMD + " 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: