fix(project_diff_preview): show diff on UD unmerged changes

Author: tanvirtin

lua/vgit/features/screens/ProjectDiffScreen/Store.lua

@@ -85,6 +85,8 @@ function Store:get_file_lines(file, status)
 
   if file_status:has_both('DU') then
     err, lines = self.git:show(filename, ':3')
+  elseif file_status:has_both('UD') then
+    err, lines = self.git:show(filename, ':2')
   elseif file_status:has('D ') then
     err, lines = self.git:show(filename, 'HEAD')
   elseif status == 'staged' or file_status:has(' D') then
@@ -103,7 +105,9 @@ function Store:get_file_hunks(file, status, lines)
   local hunks_err, hunks
 
   if file_status:has_both('DU') then
-    hunks_err, hunks = self.git:unmerged_hunks(filename)
+    hunks_err, hunks = self.git:unmerged_hunks(filename, ':3', ':1')
+  elseif file_status:has_both('UD') then
+    hunks_err, hunks = self.git:unmerged_hunks(filename, ':1', ':2')
   elseif file_status:has_both('??') then
     hunks = self.git:untracked_hunks(lines)
   elseif file_status:has_either('DD') then
@@ -228,7 +232,7 @@ function Store:get_diff_dto()
   end
 
   local file_status = file.status
-  local is_deleted = not file_status:has_both('DU') and file_status:has_either('DD')
+  local is_deleted = not (file_status:has_both('DU') or file_status:has_both('UD')) and file_status:has_either('DD')
   local diff_dto = diff_service:generate(hunks, lines, self.shape, { is_deleted = is_deleted })
 
   self._cache.diff_dtos[cache_key] = diff_dto

lua/vgit/git/cli/Git.lua

@@ -463,7 +463,7 @@ Git.remote_hunks = loop.promisify(function(self, filename, parent_hash, commit_h
   }, spec)):start()
 end, 6)
 
-Git.unmerged_hunks = loop.promisify(function(self, filename, spec, callback)
+Git.unmerged_hunks = loop.promisify(function(self, filename, stage_a, stage_b, spec, callback)
   local result = {}
   local err = {}
   local args = utils.list.merge(self.fallback_args, {
@@ -477,8 +477,8 @@ Git.unmerged_hunks = loop.promisify(function(self, filename, spec, callback)
     string.format('--diff-algorithm=%s', self.diff_algorithm),
     '--patch-with-raw',
     '--unified=0',
-    string.format(':3:%s', filename),
-    string.format(':1:%s', filename),
+    string.format('%s:%s', stage_a, filename),
+    string.format('%s:%s', stage_b, filename),
   })
 
   GitReadStream(utils.object.defaults({
@@ -505,7 +505,7 @@ Git.unmerged_hunks = loop.promisify(function(self, filename, spec, callback)
       return callback(nil, hunks)
     end,
   }, spec)):start()
-end, 4)
+end, 6)
 
 Git.staged_hunks = loop.promisify(function(self, filename, spec, callback)
   local result = {}