feat(ST2.GitPackages): bump up all packages

- Refresh PackageCache with latest versions of everything

EthanBrown.SublimeText2.GitPackages/tools/PackageCache/Modific/Modific.py

@@ -268,23 +268,32 @@ class DiffCommand(VcsCommand):
         pass
 
     def git_diff_command(self, file_name):
-        return [self.get_user_command('git') or 'git', 'diff', '--no-color', '--no-ext-diff', '--', file_name]
+        vcs_options = self.settings.get('vcs_options', {}).get('git') or ['--no-color', '--no-ext-diff']
+        return [self.get_user_command('git') or 'git', 'diff'] + vcs_options + ['--', file_name]
 
     def svn_diff_command(self, file_name):
         params = [self.get_user_command('svn') or 'svn', 'diff']
-        if self.settings.get('svn_use_internal_diff', True):
+        params.extend(self.settings.get('vcs_options', {}).get('svn', []))
+
+        if '--internal-diff' not in params and self.settings.get('svn_use_internal_diff', True):
             params.append('--internal-diff')
+
+        # if file starts with @, use `--revision HEAD` option
+        # https://github.com/gornostal/Modific/issues/17
         if file_name.find('@') != -1:
             file_name += '@'
             params.extend(['--revision', 'HEAD'])
-        params.extend([file_name])
+
+        params.append(file_name)
         return params
 
     def bzr_diff_command(self, file_name):
-        return [self.get_user_command('bzr') or 'bzr', 'diff', file_name]
+        vcs_options = self.settings.get('vcs_options', {}).get('bzr', [])
+        return [self.get_user_command('bzr') or 'bzr', 'diff'] + vcs_options + [file_name]
 
     def hg_diff_command(self, file_name):
-        return [self.get_user_command('hg') or 'hg', 'diff', file_name]
+        vcs_options = self.settings.get('vcs_options', {}).get('hg', [])
+        return [self.get_user_command('hg') or 'hg', 'diff'] + vcs_options + [file_name]
 
 
 class ShowDiffCommand(DiffCommand, sublime_plugin.TextCommand):
@@ -411,7 +420,7 @@ class DiffParser(object):
 
 class HlChangesCommand(DiffCommand, sublime_plugin.TextCommand):
     def hl_lines(self, lines, hl_key):
-        if (not len(lines)):
+        if (not len(lines) or not self.settings.get('highlight_changes')):
             self.view.erase_regions(hl_key)
             return
 

EthanBrown.SublimeText2.GitPackages/tools/PackageCache/Modific/Modific.sublime-settings

@@ -1,5 +1,8 @@
-    // Modific default settings
+// Modific default settings
 {
+    // Highlight changes
+    "highlight_changes": true,
+
     // Name of a region icon
     // Valid icon names are: modific, dot, circle, bookmark and cross
     // WARNING: if you set value different than 'modific',
@@ -16,6 +19,11 @@
         ["hg" , "hg"]
     ],
 
+    // default list of options for a diff command for a certain VCS
+    "vcs_options": {
+        "git": ["--no-color", "--no-ext-diff"]
+    },
+
     //if you have some weird OS, that has non-unicode console
     //place its console encoding here
     "console_encoding" : "",
@@ -26,7 +34,10 @@
     // set to false to disable automatic saving
     "autosave": true,
 
-    "svn_use_internal_diff": true,
+    // Turn this option on if you're using SVN 1.7 or higher
+    // this instructs Subversion to use its built-in differencing engine
+    // despite any external differencing mechanism that may be specified for use in the user's runtime configuration.
+    "svn_use_internal_diff": false,
 
     // File size limit (in KB) for drawing icons on the gutter
     "max_file_size": 1024

EthanBrown.SublimeText2.GitPackages/tools/PackageCache/Modific/README.md

@@ -36,13 +36,13 @@ The "Packages" directory is located at:
 
 Please, make sure your VCS binaries is in the PATH (**especially if you are on Windows**).
 
-To do that on Windows, open `Controll Panel -> System -> Advanced system settings -> Environment variables -> System Variables`, find PATH, click "Edit" and append `;C:\path\to\VCS\binaries` for every VCS you will use (or make sure it's already there).
+To do that on Windows, open `Control Panel -> System -> Advanced system settings -> Environment variables -> System Variables`, find PATH, click "Edit" and append `;C:\path\to\VCS\binaries` for every VCS you will use (or make sure it's already there).
 
 Features / Usage
 ----------------
 
 **Highlight changes** *(automatically: on save or when window gets focus)*
-[![Highlight changes](http://i.imgur.com/FgpyRl.jpg)](http://i.imgur.com/FgpyR.jpg)
+[![Highlight changes](http://i.imgur.com/DX8TeJTl.jpg)](http://i.imgur.com/DX8TeJT.jpg)
 
 **Show diff** `Ctrl+Alt+D` on Linux/Windows and OS X
 [![Show diff](http://i.imgur.com/csCw7l.jpg)](http://i.imgur.com/csCw7.jpg)
@@ -76,6 +76,11 @@ If some sacred punishment has been bestowed upon you, and you have no other choi
 
 If you use different than the default theme, you can customize colors of bullets on the gutter by adding [this](https://gist.github.com/3692073) chunk of code to your theme.
 
+### SVN users
+If you are using SVN 1.7 you may want to turn on option `svn_use_internal_diff`.   
+This instructs Subversion to use its built-in differencing engine
+despite any external differencing mechanism that may be specified for use in the user's runtime configuration.
+
 Thanks to
 ---------
 

EthanBrown.SublimeText2.GitPackages/tools/PackageCache/Modific/package-metadata.json

@@ -1 +1 @@
-{"url": "https://github.com/gornostal/Modific", "version": "2013.03.01.06.02.08", "description": "Highlight lines changed since the last commit (supports Git, SVN, Bazaar and Mercurial) / ST2(3) plugin"}
+{"url": "https://github.com/gornostal/Modific", "version": "2013.08.23.12.05.13", "description": "Highlight lines changed since the last commit (supports Git, SVN, Bazaar and Mercurial) / ST2(3) plugin"}