From e5d493ab1369ea84c61c21707e62ed06f90c8f78 Mon Sep 17 00:00:00 2001
From: Kyle Gottfried <6462596+Spitfire1900@users.noreply.github.com>
Date: Thu, 28 Mar 2024 00:54:34 -0400
Subject: [PATCH] implement pygitstatus, add names

---
 TODO.md                           |  2 +-
 xontrib/pygitstatus/entrypoint.py |  6 ++-
 xontrib/pygitstatus/prompts.py    | 76 ++++++++++++++++++++++++-------
 3 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/TODO.md b/TODO.md
index 8415cf9..dfc973c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -18,7 +18,7 @@
 'gitstatus.lines_added': <Prompt: gitstatus.lines_added>, # DONE
 'gitstatus.lines_removed': <Prompt: gitstatus.lines_removed>, # DONE
 'gitstatus.clean': <Prompt: gitstatus.clean>, # DONE
-'gitstatus': <Prompt: gitstatus>, # TODO
+'gitstatus': <Prompt: gitstatus>, # DONE
 ```
 
 -   currbranch <!--
diff --git a/xontrib/pygitstatus/entrypoint.py b/xontrib/pygitstatus/entrypoint.py
index 546b1d1..732fe17 100644
--- a/xontrib/pygitstatus/entrypoint.py
+++ b/xontrib/pygitstatus/entrypoint.py
@@ -3,8 +3,9 @@
 from xonsh.built_ins import XonshSession
 
 from .prompts import (ahead, behind, branch, changed, clean, conflicts, curr_branch,
-                      deleted, lines_added, lines_deleted, numstat, repo_path,
-                      short_head, staged, stash_count, tag, tag_or_hash, untracked)
+                      deleted, gitstatus, lines_added, lines_deleted, numstat,
+                      repo_path, short_head, staged, stash_count, tag, tag_or_hash,
+                      untracked)
 
 
 def _load_xontrib_(xsh: XonshSession, **_) -> dict:
@@ -27,6 +28,7 @@ def _load_xontrib_(xsh: XonshSession, **_) -> dict:
 
     prompt_fields: MutableMapping
     prompt_fields = xsh.env.get('PROMPT_FIELDS')  # type: ignore
+    prompt_fields['pygitstatus'] = gitstatus
     prompt_fields['pygitstatus_curr_branch'] = curr_branch
     prompt_fields['pygitstatus.ahead'] = ahead
     prompt_fields['pygitstatus.behind'] = behind
diff --git a/xontrib/pygitstatus/prompts.py b/xontrib/pygitstatus/prompts.py
index 3daaead..7e659e1 100644
--- a/xontrib/pygitstatus/prompts.py
+++ b/xontrib/pygitstatus/prompts.py
@@ -13,7 +13,7 @@
 ### .venv/Lib/site-packages/xonsh/prompt/gitstatus.py
 
 
-@PromptField.wrap(prefix='↑·', info='ahead')
+@PromptField.wrap(prefix='↑·', info='ahead', name='pygitstatus.ahead')
 def ahead(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     _ahead, _behind = (0, 0)
@@ -29,7 +29,7 @@ def ahead(fld: PromptField, ctx: PromptFields):
     fld.value = str(_ahead) if _ahead else ''
 
 
-@PromptField.wrap(prefix='↓·', info='behind')
+@PromptField.wrap(prefix='↓·', info='behind', name='pygitstatus.behind')
 def behind(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     _ahead, _behind = (0, 0)
@@ -45,7 +45,7 @@ def behind(fld: PromptField, ctx: PromptFields):
     fld.value = str(_behind) if _behind else ''
 
 
-@PromptField.wrap(prefix='{CYAN}', info='branch')
+@PromptField.wrap(prefix='{CYAN}', info='branch', name='pygitstatus.branch')
 def branch(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -53,7 +53,8 @@ def branch(fld: PromptField, ctx: PromptFields):
         fld.value = repo.head.shorthand
 
 
-@PromptField.wrap(prefix="{BLUE}+", suffix="{RESET}", info="changed")
+@PromptField.wrap(prefix="{BLUE}+", suffix="{RESET}", info="changed",
+                  name='pygitstatus.changed')
 def changed(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -64,7 +65,8 @@ def changed(fld: PromptField, ctx: PromptFields):
             fld.value = str(untracked_count)
 
 
-@PromptField.wrap(prefix="{RED}×", suffix="{RESET}", info="conflicts")
+@PromptField.wrap(prefix="{RED}×", suffix="{RESET}", info="conflicts",
+                  name='pygitstatus.conflicts')
 def conflicts(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -75,7 +77,8 @@ def conflicts(fld: PromptField, ctx: PromptFields):
             fld.value = str(conflicted_count)
 
 
-@PromptField.wrap(prefix='{BOLD_GREEN}', suffix='{RESET}', symbol='✓')
+@PromptField.wrap(prefix='{BOLD_GREEN}', suffix='{RESET}', symbol='✓',
+                  name='pygitstatus.clean')
 def clean(fld: PromptField, ctx: PromptFields):
 
     # symbol attribute is auto-populated by wrap function
@@ -96,7 +99,8 @@ def curr_branch() -> Optional[str]:
         return repo.head.shorthand
 
 
-@PromptField.wrap(prefix="{RED}-", suffix="{RESET}", info="deleted")
+@PromptField.wrap(prefix="{RED}-", suffix="{RESET}", info="deleted",
+                  name='pygitstatus.deleted')
 def deleted(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -107,7 +111,7 @@ def deleted(fld: PromptField, ctx: PromptFields):
             fld.value = str(untracked_count)
 
 
-@PromptField.wrap(prefix="{CYAN}+", suffix="{RESET}")
+@PromptField.wrap(prefix="{CYAN}+", suffix="{RESET}", name='pygitstatus.lines_added')
 def lines_added(fld: PromptField, ctx: PromptFields):
     fld.value = ''
 
@@ -118,7 +122,8 @@ def lines_added(fld: PromptField, ctx: PromptFields):
             fld.value = str(inserts)
 
 
-@PromptField.wrap(prefix="{INTENSE_RED}-", suffix="{RESET}")
+@PromptField.wrap(prefix="{INTENSE_RED}-", suffix="{RESET}",
+                  name='pygitstatus.lines_deleted')
 def lines_deleted(fld: PromptField, ctx: PromptFields):
     fld.value = ''
 
@@ -129,7 +134,7 @@ def lines_deleted(fld: PromptField, ctx: PromptFields):
             fld.value = str(deletes)
 
 
-@PromptField.wrap()
+@PromptField.wrap(name='pygitstatus.numstat')
 def numstat(fld: PromptField, ctx: PromptFields):
     fld.value = str((0, 0))
     insert = 0
@@ -144,7 +149,7 @@ def numstat(fld: PromptField, ctx: PromptFields):
     fld.value = str((insert, delete))
 
 
-@PromptField.wrap()
+@PromptField.wrap(name='pygitstatus.repo_path')
 def repo_path(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -155,7 +160,7 @@ def repo_path(fld: PromptField, ctx: PromptFields):
         fld.value = os.path.relpath(repo.path)
 
 
-@PromptField.wrap(prefix=':')
+@PromptField.wrap(prefix=':', name='pygitstatus.short_head')
 def short_head(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -165,7 +170,8 @@ def short_head(fld: PromptField, ctx: PromptFields):
             fld.value = local_commit.short_id
 
 
-@PromptField.wrap(prefix="{RED}●", suffix="{RESET}", info="staged")
+@PromptField.wrap(prefix="{RED}●", suffix="{RESET}", info="staged",
+                  name='pygitstatus.staged')
 def staged(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -182,7 +188,7 @@ def staged(fld: PromptField, ctx: PromptFields):
             fld.value = str(untracked_count)
 
 
-@PromptField.wrap(prefix="⚑")
+@PromptField.wrap(prefix="⚑", name='pygitstatus.stash_count')
 def stash_count(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -192,7 +198,7 @@ def stash_count(fld: PromptField, ctx: PromptFields):
             fld.value = str(_stash_count)
 
 
-@PromptField.wrap()
+@PromptField.wrap(name='pygitstatus.tag')
 def tag(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -200,7 +206,7 @@ def tag(fld: PromptField, ctx: PromptFields):
         fld.value = repo.describe()
 
 
-@PromptField.wrap()
+@PromptField.wrap(name='pygitstatus.tag_or_hash')
 def tag_or_hash(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -213,7 +219,7 @@ def tag_or_hash(fld: PromptField, ctx: PromptFields):
             fld.value = repo.lookup_reference(repo.head.name).peel(Commit).short_id
 
 
-@PromptField.wrap(prefix="…", info="untracked")
+@PromptField.wrap(prefix="…", info="untracked", name='pygitstatus.untracked')
 def untracked(fld: PromptField, ctx: PromptFields):
     fld.value = ''
     with contextlib.suppress(GitError):
@@ -222,3 +228,39 @@ def untracked(fld: PromptField, ctx: PromptFields):
             [v for k, v in repo.status().items() if v == GIT_STATUS_WT_NEW])
         if untracked_count > 0:
             fld.value = str(untracked_count)
+
+
+class GitStatus(MultiPromptField):
+    """Return str `BRANCH|OPERATOR|numbers`"""
+
+    _name = 'pygitstatus'
+    fragments = (
+        ".branch",
+        ".ahead",
+        ".behind",
+        "gitstatus.operations",  # does not use subprocess calls
+        "{RESET}|",
+        ".staged",
+        ".conflicts",
+        ".changed",
+        ".deleted",
+        ".untracked",
+        ".stash_count",
+        ".lines_added",
+        ".lines_removed",
+        ".clean",
+    )
+    hidden = (
+        ".lines_added",
+        ".lines_removed",
+    )
+    """These fields will not be processed for the result"""
+
+    def get_frags(self, env):
+        for frag in self.fragments:
+            if frag in self.hidden:
+                continue
+            yield frag
+
+
+gitstatus = GitStatus()