Skip to content

Commit

Permalink
fix(cli): fix the wrong graph in "gas log" when merging branches
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallmallows committed Nov 15, 2021
1 parent 672ad4b commit 308828c
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions tensorbay/cli/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,10 @@ def _add_graph_oneline(
# Merge branches.
del self._layer_colors[self._merge_pointer]
lines = [f"{self._get_title_prefix(prefixes, original_pointer)} {log}"]
lines.extend(f"{prefixes}\n" for prefixes in self._get_merge_prefixes())
lines.extend(
f"{prefixes}\n"
for prefixes in self._get_merge_prefixes(self._merge_pointer, self._pointer)
)
return "".join(lines)

def _add_graph_full(
Expand All @@ -342,21 +345,28 @@ def _add_graph_full(
else:
# Merge branches.
del self._layer_colors[self._merge_pointer]
merge_prefixes = self._get_merge_prefixes()
merge_prefixes = self._get_merge_prefixes(self._merge_pointer, self._pointer)
lines.extend(self._combine_details(list(merge_prefixes), list(splitlines)))
return "".join(lines)

def _get_colorful_prefixes(self) -> List[str]:
return [click.style("|", fg=color) for color in self._layer_colors]

def _get_merge_prefixes(self) -> Iterator[str]:
def _get_merge_prefixes(self, merge_pointer: int, pointer: int) -> Iterator[str]:
prefixes = []
for color in self._layer_colors:
prefixes.append(click.style("|", fg=color))
prefixes.append(" ")
for i in range(self._merge_pointer, self._pointer, -1): # type: ignore[arg-type]

color_number = len(self._layer_colors)
for i in range(merge_pointer, pointer, -1):
temp_prefixes = prefixes.copy()
temp_prefixes[2 * i - 1] = click.style("/", fg=self._layer_colors[self._pointer])
temp_prefixes[2 * i - 1] = click.style("/", fg=self._layer_colors[pointer])
for j in range(color_number - merge_pointer):
temp_prefixes[2 * i + j] = " "
temp_prefixes[2 * i + j + 1] = click.style(
"/", fg=self._layer_colors[merge_pointer + j]
)
yield "".join(temp_prefixes)

@staticmethod
Expand Down

0 comments on commit 308828c

Please sign in to comment.