Fixes gornostal#79 - Take into account `view.settings().get(default_l…

…ine_ending)` when choosing what line endings to use

Modific.py

@@ -339,6 +339,21 @@ def tf_diff_command(self, file_name):
         vcs_options = self.settings.get('vcs_options', {}).get('tf') or ['-format:unified']
         return [get_user_command('tf') or 'tf', 'diff'] + vcs_options + [file_name]
 
+    def join_lines(self, lines):
+        """
+        Join lines using os.linesep.join(), unless another method is specified in ST settings
+        """
+        le = self.view.settings().get('default_line_ending')
+        if self.settings.get('debug'):
+            print("use line endings:", le)
+
+        if le == 'windows':
+            return "\r\n".join(lines)
+        elif le == 'unix':
+            return "\n".join(lines)
+
+        return os.linesep.join(lines)
+
 
 class ShowDiffCommand(DiffCommand, sublime_plugin.TextCommand):
     def diff_done(self, result):
@@ -506,7 +521,7 @@ def run(self, edit):
         (row, col) = self.view.rowcol(self.view.sel()[0].begin())
         (lines, start, replace_lines) = diff_parser.get_original_part(row + 1)
         if lines is not None:
-            self.panel(os.linesep.join(lines))
+            self.panel(self.join_lines(lines))
 
 
 class ReplaceModifiedPartCommand(DiffCommand, sublime_plugin.TextCommand):
@@ -523,7 +538,7 @@ def run(self, edit):
             print('replace', (lines, current, replace_lines))
         if lines is not None:
             begin = self.view.text_point(current - 1, 0)
-            content = os.linesep.join(lines)
+            content = self.join_lines(lines)
             if replace_lines:
                 end = self.view.line(self.view.text_point(replace_lines + current - 2, 0)).end()
                 region = sublime.Region(begin, end)

README.md

@@ -81,6 +81,12 @@ 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.
 
+### Line endings
+Modific takes into account `default_line_ending` setting that you can change in your "User Settings" (or per project/file basis).  
+It determines what characters to use to join lines when Modific does "Revert change" action.  
+Valid values: `system` (OS-dependent), `windows` (CRLF) and `unix` (LF).
+
+
 Thanks to
 ---------