From 0f4923560c77838965d229fb59bcbce4b5f5f95e Mon Sep 17 00:00:00 2001 From: James Downie Date: Tue, 15 Jul 2025 07:18:01 +1000 Subject: [PATCH 1/4] Added a new beaker for a second draft. --- .../logo/{beaker.png => beakerErlenmeyer.png} | Bin jdownie/logo/beakerSquare.png | Bin 0 -> 4037 bytes jdownie/logo/{bridge.png => bridgeStorey.png} | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename jdownie/logo/{beaker.png => beakerErlenmeyer.png} (100%) create mode 100644 jdownie/logo/beakerSquare.png rename jdownie/logo/{bridge.png => bridgeStorey.png} (100%) diff --git a/jdownie/logo/beaker.png b/jdownie/logo/beakerErlenmeyer.png similarity index 100% rename from jdownie/logo/beaker.png rename to jdownie/logo/beakerErlenmeyer.png diff --git a/jdownie/logo/beakerSquare.png b/jdownie/logo/beakerSquare.png new file mode 100644 index 0000000000000000000000000000000000000000..c0201b67be72afc8e42584f56d1abf95c9e96a1e GIT binary patch literal 4037 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 Mg5?3Fe&V#h0~g}Bw*UYD literal 0 HcmV?d00001 diff --git a/jdownie/logo/bridge.png b/jdownie/logo/bridgeStorey.png similarity index 100% rename from jdownie/logo/bridge.png rename to jdownie/logo/bridgeStorey.png From 203037fa16e02791799740d38f665a3b470f2e81 Mon Sep 17 00:00:00 2001 From: James Downie Date: Tue, 15 Jul 2025 07:47:35 +1000 Subject: [PATCH 2/4] Lazy commit on yancy. --- jdownie/repo/repo | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/jdownie/repo/repo b/jdownie/repo/repo index 8a30ce0..fa4783f 100755 --- a/jdownie/repo/repo +++ b/jdownie/repo/repo @@ -43,7 +43,7 @@ def to_keycap(ch: str) -> str: def indicators(props, ind = "tl"): tl = "\U0001F7E2" - if props["ab"]["push"] + props["ab"]["pull"] > 0: + if "ab" in props.keys() and ( props["ab"]["push"] + props["ab"]["pull"] > 0 ): tl = "\U0001F7E1" if props["n"] > 0: tl = "\U0001F534" @@ -52,10 +52,15 @@ def indicators(props, ind = "tl"): down_keycap = "\U0001F53D" # "\u2B07\uFE0F" status_digit = "#" if props["n"] > 9 else str(props["n"] % 10) status_indicator = f"{to_keycap(status_digit)}{unstaged}" - push_digit = "#" if props["ab"]["push"] > 9 else str(props["ab"]["push"] % 10) - push_indicator = f"{to_keycap(push_digit)}{up_keycap}" - pull_digit = "#" if props["ab"]["pull"] > 9 else str(props["ab"]["pull"] % 10) - pull_indicator = f"{to_keycap(pull_digit)}{down_keycap}" + push_digit = "?" + push_indicator = " " + pull_digit = "?" + pull_indicator = " " + if "ab" in props.keys(): + push_digit = "#" if props["ab"]["push"] > 9 else str(props["ab"]["push"] % 10) + push_indicator = f"{to_keycap(push_digit)}{up_keycap}" + pull_digit = "#" if props["ab"]["pull"] > 9 else str(props["ab"]["pull"] % 10) + pull_indicator = f"{to_keycap(pull_digit)}{down_keycap}" ret = "?" if ind == "tl": ret = f"{tl}" @@ -208,22 +213,20 @@ if __name__ == "__main__": path = os.path.expanduser( cfg[k]["path"] ) if os.path.exists( path ): n = 0 + props = dict() + props["key"] = k if isFossil(cfg[k]): cwd = os.path.expanduser(cfg[k]["path"]) cmd = "fossil json status" - output = json.loads(execute_command(cmd)) + output = json.loads(execute_command(cmd, cwd=cwd)) n = len(output["payload"]["files"]) - print(n) cmd = "fossil extras" - lines = execute_command(cmd).split("\n") + lines = execute_command(cmd, cwd=cwd).split("\n") for line in lines: if len(line.strip()) > 0: n = n + 1 - print(n) else: cmd = "git -C \"{0}\" status --porcelain=2 --branch".format( path ) - props = dict() - props["key"] = k lines = execute_command(cmd).split("\n") for line in lines: m = re.match(r"# branch\.(\S+)\s+(.+)$", line) From 08b90a919a82f714dc38ee0ecd820f7b5aa43a8e Mon Sep 17 00:00:00 2001 From: James Downie Date: Tue, 15 Jul 2025 09:25:39 +1000 Subject: [PATCH 3/4] Lazy commit on . --- jdownie/repo/repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdownie/repo/repo b/jdownie/repo/repo index ad471b1..005c8c7 100755 --- a/jdownie/repo/repo +++ b/jdownie/repo/repo @@ -155,7 +155,7 @@ def perform_action(action, key, item, silent = False): elif action == "lc": if isFossil(item): cwd = Path(os.path.expanduser(item["path"])) - cmd = f"fossil add ." + cmd = f"fossil addremove ." output = execute_command(cmd, cwd=cwd) cmd = f"fossil commit -m \"Lazy commit on {hostname}\"" output = execute_command(cmd, cwd=cwd) From 8e19be94439cb10197eab3821dea12bf139c14a7 Mon Sep 17 00:00:00 2001 From: James Downie Date: Tue, 15 Jul 2025 16:09:50 +1000 Subject: [PATCH 4/4] Lazy commit on frankie. --- jdownie/repo/repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdownie/repo/repo b/jdownie/repo/repo index 2165e10..9d4e0a0 100755 --- a/jdownie/repo/repo +++ b/jdownie/repo/repo @@ -53,9 +53,9 @@ def indicators(props, ind = "tl"): status_digit = "#" if props["n"] > 9 else str(props["n"] % 10) status_indicator = f"{to_keycap(status_digit)}{unstaged}" push_digit = "?" - push_indicator = " " + push_indicator = f" {up_keycap}" pull_digit = "?" - pull_indicator = " " + pull_indicator = f" {down_keycap}" if "ab" in props.keys(): push_digit = "#" if props["ab"]["push"] > 9 else str(props["ab"]["push"] % 10) push_indicator = f"{to_keycap(push_digit)}{up_keycap}"