implement conflicts

Spitfire1900 · Mar 28, 2024 · d7dd654 · d7dd654
1 parent 9b046e4
commit d7dd654
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/TODO.md b/TODO.md
@@ -12,7 +12,7 @@
 'gitstatus.untracked': <Prompt: gitstatus.untracked>, # DONE
 'gitstatus.changed': <Prompt: gitstatus.changed>, # DONE
 'gitstatus.deleted': <Prompt: gitstatus.deleted>, # DONE
-'gitstatus.conflicts': <Prompt: gitstatus.conflicts>, # TODO
+'gitstatus.conflicts': <Prompt: gitstatus.conflicts>, # DONE
 'gitstatus.staged': <Prompt: gitstatus.staged>, # DONE
 'gitstatus.numstat': <Prompt: gitstatus.numstat>, # TODO
 'gitstatus.lines_added': <Prompt: gitstatus.lines_added>, # TODO

diff --git a/xontrib/pygitstatus/entrypoint.py b/xontrib/pygitstatus/entrypoint.py
@@ -2,9 +2,9 @@
 
 from xonsh.built_ins import XonshSession
 
-from .prompts import (ahead, behind, branch, changed, clean, curr_branch, deleted,
-                      repo_path, short_head, staged, stash_count, tag, tag_or_hash,
-                      untracked)
+from .prompts import (ahead, behind, branch, changed, clean, conflict, curr_branch,
+                      deleted, repo_path, short_head, staged, stash_count, tag,
+                      tag_or_hash, untracked)
 
 
 def _load_xontrib_(xsh: XonshSession, **_) -> dict:
@@ -34,6 +34,7 @@ def _load_xontrib_(xsh: XonshSession, **_) -> dict:
     prompt_fields['pygitstatus.branch'] = branch
     prompt_fields['pygitstatus.changed'] = changed
     prompt_fields['pygitstatus.clean'] = clean
+    prompt_fields['pygitstatus.conflicts'] = conflict
     prompt_fields['pygitstatus.deleted'] = deleted
     prompt_fields['pygitstatus.repo_path'] = repo_path
     prompt_fields['pygitstatus.short_head'] = short_head

diff --git a/xontrib/pygitstatus/prompts.py b/xontrib/pygitstatus/prompts.py
@@ -3,10 +3,10 @@
 from typing import Optional
 
 # pylint: disable=no-name-in-module
-from pygit2 import (GIT_STATUS_INDEX_MODIFIED, GIT_STATUS_INDEX_NEW,
-                    GIT_STATUS_INDEX_RENAMED, GIT_STATUS_INDEX_TYPECHANGE,
-                    GIT_STATUS_WT_DELETED, GIT_STATUS_WT_MODIFIED, GIT_STATUS_WT_NEW,
-                    Commit, GitError)
+from pygit2 import (GIT_STATUS_CONFLICTED, GIT_STATUS_INDEX_MODIFIED,
+                    GIT_STATUS_INDEX_NEW, GIT_STATUS_INDEX_RENAMED,
+                    GIT_STATUS_INDEX_TYPECHANGE, GIT_STATUS_WT_DELETED,
+                    GIT_STATUS_WT_MODIFIED, GIT_STATUS_WT_NEW, Commit, GitError)
 from pygit2 import Repository as Repo
 from xonsh.prompt.base import MultiPromptField, PromptField, PromptFields
 
@@ -70,6 +70,17 @@ def changed(fld: PromptField, ctx: PromptFields):
             fld.value = str(untracked_count)
 
 
+@PromptField.wrap(prefix="{RED}-", suffix="{RESET}", info="deleted")
+def conflict(fld: PromptField, ctx: PromptFields):
+    fld.value = ''
+    with contextlib.suppress(GitError):
+        repo = Repo('.')
+        conflicted_count = len(
+            [v for k, v in repo.status().items() if v == GIT_STATUS_CONFLICTED])
+        if conflicted_count > 0:
+            fld.value = str(conflicted_count)
+
+
 @PromptField.wrap(prefix="{RED}-", suffix="{RESET}", info="deleted")
 def deleted(fld: PromptField, ctx: PromptFields):
     fld.value = ''