Commits

Alexey Orlov committed 901222d

removed log_error import (doesnt work on win it seems) - just print error on root op, fixed repo diff

  • Participants
  • Parent commits c33ce04

Comments (0)

Files changed (2)

 import os
 import subprocess
 
-from .sublime_diff import log_error
-
 def default_diff_settings():
     return sublime.load_settings("sublime-diff-default.sublime-settings")
 
         result, err = p.communicate()
 
         if not err: return result.decode("utf-8").strip()
-        else:       log_error(err.decode("utf-8").strip())
+        else:       print(err.decode("utf-8").strip())
 
     return cvs_root_project(window)
 
     if repo_diff and filename:
         sublime.status_message("SublimeCVSDiff using auto root " + root)
 
-    path = os.path.relpath(filename, root) if (filename and os.path.isabs(filename) and not repo_diff) else filename
+    path = None
+    if not repo_diff:
+        path = os.path.relpath(filename, root) if filename and os.path.isabs(filename) else filename
+
     cmd  = cvs_binding.setting_value("command", window) + (" \"" + path + "\"" if path else "")
     cwd  = root + "/"