Permalink
Browse files

vlt_command setting fixed + notes updated

  • Loading branch information...
1 parent d82b635 commit 5baeae091858dc82937af2eeb187844296abf95e Tomek Wytrębowicz committed Sep 13, 2012
Showing with 11 additions and 9 deletions.
  1. +2 −1 messages.json
  2. +4 −3 messages/{0.1.2.txt → 0.1.3.txt}
  3. +1 −2 messages/install.txt
  4. +2 −2 vlt.py
  5. BIN vlt.pyc
  6. +2 −1 vlt.sublime-settings
View
@@ -1,4 +1,5 @@
{
"install": "messages/install.txt",
- "0.1": "messages/0.1.txt"
+ "0.1": "messages/0.1.txt",
+ "0.1.3": "messages/0.1.3.txt",
}
@@ -1,6 +1,7 @@
-Vlt integration 0.1.2 changelog:
+Vlt integration 0.1.3 changelog:
+I get inspired by, and copied lots of code from https://github.com/kemayo/sublime-text-2-git
-Feature:
+Features:
- Status quick panel added:
- show status of current vlt root
- show diff on selected entities
@@ -10,4 +11,4 @@ Feature:
- add all
- Revert.. panel, revert modified entries
- Update Root command: updates entire repo.
- - resolve command, mark file as resolved
+ - Customizable vlt command path (vlt settings: vlt_command)
View
@@ -1,7 +1,6 @@
Vlt (CQ) integration by Tomek Wytrebowicz (tomalecwp@gmail.com)
-Code is based on Perforce Plugin https://github.com/ericmartel/Sublime-Text-2-Perforce-Plugin by Eric Marings to control which features are enabled,
-and it is still in progress.
+Code is based on Perforce Plugin https://github.com/ericmartel/Sublime-Text-2-Perforce-Plugin by Eric Marings and https://github.com/kemayo/sublime-text-2-git
Please direct any feedback to tomalecwp@gmail.com or through github at https://github.com/tomalec/Sublime-Text-2-Vlt-Plugin.
View
4 vlt.py
@@ -117,7 +117,7 @@ def run(self):
main_thread(self.on_done, e.returncode)
except OSError, e:
if e.errno == 2:
- main_thread(sublime.error_message, "Git binary could not be found in PATH\n\nConsider using the git_command setting for the Git plugin\n\nPATH is: %s" % os.environ['PATH'])
+ main_thread(sublime.error_message, "Vlt binary could not be found in PATH\n\nConsider using the vlt_command setting for the vlt plugin\n\nPATH is: %s" % os.environ['PATH'])
else:
raise e
@@ -134,7 +134,7 @@ def run_command(self, command, callback=None, show_status=True,
if 'fallback_encoding' not in kwargs and self.active_view() and self.active_view().settings().get('fallback_encoding'):
kwargs['fallback_encoding'] = self.active_view().settings().get('fallback_encoding').rpartition('(')[2].rpartition(')')[0]
- s = sublime.load_settings("Vlt.sublime-settings")
+ s = sublime.load_settings("vlt.sublime-settings")
if s.get('save_first') and self.active_view() and self.active_view().is_dirty() and not no_save:
self.active_view().run_command('save')
if command[0] == 'vlt' and s.get('vlt_command'):
View
BIN vlt.pyc
Binary file not shown.
View
@@ -2,5 +2,6 @@
"vlt_auto_commit": true, // when true, commit will occur
"vlt_auto_add": true, // when true, add will occur
"vlt_warnings_enabled": true, // will output messages when warnings happen
- "vlt_log_warnings_to_status": false
+ "vlt_log_warnings_to_status": false,
+ "vlt_command": false //path to vlt binary (if not in PATH)
}

0 comments on commit 5baeae0

Please sign in to comment.