# # # patch "config.py" # from [fde8b010525104fe45abbead5000f9c9c40c054e] # to [11fcbdb34545f45933e77c0af3feebac841c554f] # # patch "monotone.py" # from [1634b8668fdbc8e8019ca7140d3d33003bf4c019] # to [e583cea17f5d03ba47cda2ef3937b464efe0a83b] # # patch "utility.py" # from [88570a11369d681b233221f50615b86204d75cba] # to [fb51955563d64e628e0e67e4acca1a1abc4cd989] # ============================================================ --- config.py fde8b010525104fe45abbead5000f9c9c40c054e +++ config.py 11fcbdb34545f45933e77c0af3feebac841c554f @@ -1,7 +1,7 @@ import sys monotone = '/opt/monotone/bin/monotone' -dbfile = '/home/grahame/public_html/viewmtn/viewmtn.db' +dbfile = '/home/grahame/monotone/db/monotone.db' graphdir = '/home/grahame/public_html/viewmtn/graph/' graphuri = 'graph/' ============================================================ --- monotone.py 1634b8668fdbc8e8019ca7140d3d33003bf4c019 +++ monotone.py e583cea17f5d03ba47cda2ef3937b464efe0a83b @@ -113,10 +113,9 @@ def ancestry(self, id, limit=0): rv = [] entry = None - command = self.base_command + " log " + pipes.quote(id) - if limit > 0: self.base_command += " --depth=%d" % (limit) - iterator = utility.iter_command(self.base_command + " log %s" % (pipes.quote(id))) - raise Exception(command) + command = self.base_command + " log -r " + pipes.quote(id) + if limit > 0: command += " --depth=%d" % (limit) + iterator = utility.iter_command(command) for line in iterator: if dash_re.match(line): entry = {} ============================================================ --- utility.py 88570a11369d681b233221f50615b86204d75cba +++ utility.py fb51955563d64e628e0e67e4acca1a1abc4cd989 @@ -93,6 +93,6 @@ try: if not was_timeout: p.wait() except: pass - if len(childerr_read): raise Exception("data on stderr", childerr_read) + if len(childerr_read): raise Exception("data on stderr (command is %s)" % command, childerr_read) if was_timeout: raise Exception("command timeout")