Commit 741991ef authored by Vitaly Lipatov's avatar Vitaly Lipatov

gitask ls: match girar-show output format

parent c036699e
...@@ -194,15 +194,29 @@ for i, t in enumerate(tasks): ...@@ -194,15 +194,29 @@ for i, t in enumerate(tasks):
break break
flags = [] flags = []
if t.get("test_only"): flags.append("[test-only]") if t.get("test_only"): flags.append("[test-only]")
bt = t.get("build_time", t.get("created", "")) # try.iter info
try: ti = t.get("try", 0)
dt = datetime.fromisoformat(bt) it = t.get("iter", 0)
bt = dt.strftime("%b %d %H:%M:%S %Y") tryiter = "#{}".format(ti) if it <= 1 else "#{}.{}".format(ti, it)
except (ValueError, TypeError): # package names from subtasks
pass pkgs = []
parts = [str(t["id"]), t["state"], t["repo"], bt, t["owner"]] for num in sorted(t.get("subtasks", {}).keys(), key=lambda x: int(x)):
st = t["subtasks"][num]
pkg = st.get("pkgname", "")
tag = st.get("tag_name", "")
stype = st.get("type", "repo")
if stype == "delete":
pkgs.append("(delete {})".format(pkg))
elif pkg and tag:
pkgs.append("{}.git={}".format(pkg, tag))
elif pkg:
pkgs.append(pkg)
parts = [str(t["id"]), t["state"], tryiter]
if flags: if flags:
parts.extend(flags) parts.extend(flags)
parts.append(t["repo"])
if pkgs:
parts.extend(pkgs)
line = " ".join(parts) line = " ".join(parts)
if use_color and t["state"] in colors: if use_color and t["state"] in colors:
line = colors[t["state"]] + line + reset line = colors[t["state"]] + line + reset
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment