FileDiffs
Shows diffs between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes. With contributions from Sebastian Pape (spape) and Jiri Urban (jiriurban)
Details
Installs
- Total 330K
- Win 179K
- Mac 100K
- Linux 51K
| Jun 2 | Jun 1 | May 31 | May 30 | May 29 | May 28 | May 27 | May 26 | May 25 | May 24 | May 23 | May 22 | May 21 | May 20 | May 19 | May 18 | May 17 | May 16 | May 15 | May 14 | May 13 | May 12 | May 11 | May 10 | May 9 | May 8 | May 7 | May 6 | May 5 | May 4 | May 3 | May 2 | May 1 | Apr 30 | Apr 29 | Apr 28 | Apr 27 | Apr 26 | Apr 25 | Apr 24 | Apr 23 | Apr 22 | Apr 21 | Apr 20 | Apr 19 | Apr 18 | |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Windows | 0 | 11 | 5 | 15 | 15 | 27 | 18 | 17 | 6 | 8 | 16 | 19 | 24 | 9 | 8 | 6 | 6 | 12 | 20 | 16 | 21 | 15 | 7 | 9 | 12 | 12 | 13 | 16 | 13 | 4 | 10 | 3 | 0 | 0 | 0 | 1 | 0 | 0 | 0 | 1 | 1 | 0 | 0 | 0 | 0 | 0 |
| Mac | 2 | 8 | 6 | 23 | 14 | 12 | 16 | 14 | 7 | 7 | 11 | 18 | 20 | 6 | 10 | 4 | 2 | 18 | 14 | 11 | 20 | 18 | 8 | 2 | 21 | 12 | 15 | 13 | 16 | 7 | 8 | 6 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 |
| Linux | 0 | 0 | 1 | 4 | 6 | 7 | 1 | 6 | 0 | 2 | 1 | 6 | 4 | 1 | 2 | 3 | 1 | 1 | 3 | 2 | 3 | 4 | 4 | 2 | 3 | 5 | 3 | 3 | 5 | 4 | 0 | 2 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
Readme
- Source
- raw.githubusercontent.com
FileDiffs Plugin
Shows diffs between the current file, or selection(s) in the current file, and clipboard, another file, or unsaved changes. Can be configured to show diffs in an external diff tool
Preview
Help!
Check the wiki for more tips
Installation
Using Package Control, install FileDiffs or clone this repo in your packages folder.
I recommended you add key bindings for the commands. I've included my preferred bindings below. Copy them to your key bindings file (⌘⇧,).
Add External Diff Tool (optional)
(IMPORTANT: You might need to make a symlink (e.g. in /usr/local/bin) pointing to the command line tool of your external diff tool)
Preferences > Package Settings > FileDiffs > Settings - Default
Uncomment one of the examples or write your own command to open external diff tool.
This command may need to be a full path (e.g. /usr/local/bin/ksdiff), if the command isn't in your PATH.
It supports:
- A generic setting
FileDiffs.sublime-settingswhich could be overloaded for each parameter in a platform specific configurationFileDiffs ($platform).sublime-settingsin theSettings - User - Environment variable expansions for
cmdparameter in the settings
Commands
file_diff_menu: Shows a menu to select one of the file_diff commands. If you use the bindings in Example.sublime-keymap, this is bound to ctrl+shift+d.
The rest of the commands do not need to be bound (accessible from the menu):
file_diff_clipboard: Shows the diff of the current file or selection(s) and the clipboard (the clipboard is considered the “new” file unless reverse is True)
file_diff_selections: Shows the diff of the first and second selected regions. The file_diff_menu command checks for exactly two regions selected, otherwise it doesn't display this command.
file_diff_saved: Shows the diff of the current file or selection(s) and the saved file.
file_diff_file: Shows the diff of the current file or selection(s) and a file that is in the current project.
file_diff_tab: Shows the diff of the current file or selection(s) and an open file (aka a file that has a tab).
file_diff_previous: Shows the diff of the current file or selection(s) and the previous activated file. If a file is not saved yet, dirty buffer is used instead of reading from disk.
If FileDiffs has to use temporary files, they are created in your Data/Packages folder (rather than system temp folder) due to privacy concerns for portable Sublime Text installations. Temporary files are automatically removed after 15 seconds.
Key Bindings
Copy these to your user key bindings file.
{ "keys": ["ctrl+shift+d"], "command": "file_diff_menu" },
{ "keys": ["ctrl+shift+e"], "command": "file_diff_menu", "args": {"cmd": ["opendiff", "$file1", "$file2"] } },
Contributors
Thanks to:
- Sebastian Pape for adding support for using an external diff tool
- Starli0n for merging the ST2 and ST3 branches into one branch,
- and for adding the “Diff file with previous” feature
- dnsmkl for helping with diffing temporary files