Update dev version

Update dev version
* Rename variable

Author: JE-Chen

je_editor/git/commit_graph.py

@@ -7,13 +7,12 @@
 
 @dataclass
 class CommitNode:
-    sha: str
-    author: str
-    date: str
-    message: str
-    parents: List[str]
-    lane: int = -1  # assigned later
-
+    commit_sha: str
+    author_name: str
+    commit_date: str
+    commit_message: str
+    parent_shas: List[str]
+    lane_index: int = -1  # assigned later
 
 @dataclass
 class CommitGraph:
@@ -24,14 +23,14 @@ def build(self, commits: List[Dict], refs: Dict[str, str]) -> None:
         # commits are topo-ordered by git log --topo-order; we keep it.
         self.nodes = [
             CommitNode(
-                sha=c["sha"],
-                author=c["author"],
-                date=c["date"],
-                message=c["message"],
-                parents=c["parents"],
+                commit_sha=c["sha"],
+                author_name=c["author"],
+                commit_date=c["date"],
+                commit_message=c["message"],
+                parent_shas=c["parents"],
             ) for c in commits
         ]
-        self.index = {n.sha: i for i, n in enumerate(self.nodes)}
+        self.index = {n.commit_sha: i for i, n in enumerate(self.nodes)}
         self._assign_lanes()
 
     def _assign_lanes(self) -> None:
@@ -46,30 +45,30 @@ def _assign_lanes(self) -> None:
             # If any active lane points to this commit, use that lane
             lane_found = None
             for lane, sha in list(active.items()):
-                if sha == node.sha:
+                if sha == node.commit_sha:
                     lane_found = lane
                     break
 
             if lane_found is None:
                 if free_lanes:
-                    node.lane = free_lanes.pop(0)
+                    node.lane_index = free_lanes.pop(0)
                 else:
-                    node.lane = 0 if not active else max(active.keys()) + 1
+                    node.lane_index = 0 if not active else max(active.keys()) + 1
             else:
-                node.lane = lane_found
+                node.lane_index = lane_found
 
             # Update active: current node consumes its lane, parents occupy lanes
             # Remove the current sha from any lane that pointed to it
             for lane, sha in list(active.items()):
-                if sha == node.sha:
+                if sha == node.commit_sha:
                     del active[lane]
 
             # First parent continues in the same lane; others go to free/new lanes
-            if node.parents:
-                first = node.parents[0]
-                active[node.lane] = first
+            if node.parent_shas:
+                first = node.parent_shas[0]
+                active[node.lane_index] = first
                 # Side branches
-                for p in node.parents[1:]:
+                for p in node.parent_shas[1:]:
                     # Pick a free lane or new one
                     if free_lanes:
                         pl = free_lanes.pop(0)

je_editor/pyside_ui/git/graph_view.py

@@ -84,16 +84,16 @@ def _redraw(self):
 
         edge_pen = QPen(EDGE_COLOR, 2)
         for row, node in enumerate(self.graph.nodes):
-            if not node.parents:
+            if not node.parent_shas:
                 continue
-            x0 = self._lane_x(node.lane)
+            x0 = self._lane_x(node.lane_index)
             y0 = self._row_y(row)
-            for p in node.parents:
+            for p in node.parent_shas:
                 if p not in self.graph.index:
                     continue
                 prow = self.graph.index[p]
                 parent_node = self.graph.nodes[prow]
-                x1 = self._lane_x(parent_node.lane)
+                x1 = self._lane_x(parent_node.lane_index)
                 y1 = self._row_y(prow)
                 path = QPainterPath(QPointF(x0, y0))
                 ctrl_y = (y0 + y1) / 2.0
@@ -103,20 +103,20 @@ def _redraw(self):
                 self._scene.addItem(edge_item)
 
         for row, node in enumerate(self.graph.nodes):
-            cx = self._lane_x(node.lane)
+            cx = self._lane_x(node.lane_index)
             cy = self._row_y(row)
 
             circle = QGraphicsEllipseItem(
                 QRectF(cx - NODE_RADIUS, cy - NODE_RADIUS, NODE_RADIUS * 2, NODE_RADIUS * 2)
             )
-            circle.setBrush(QBrush(lane_color(node.lane)))
+            circle.setBrush(QBrush(lane_color(node.lane_index)))
             circle.setPen(QPen(Qt.PenStyle.NoPen))
             circle.setToolTip(self.language_wrapper_get(
                 "git_graph_tooltip_commit"
-            ).format(short=node.sha[:7],
-                     author=node.author,
-                     date=node.date,
-                     msg=node.message))
+            ).format(short=node.commit_sha[:7],
+                     author=node.author_name,
+                     date=node.commit_date,
+                     msg=node.commit_message))
             self._scene.addItem(circle)
 
             label_item = QGraphicsSimpleTextItem(str(row + 1))
@@ -126,7 +126,7 @@ def _redraw(self):
 
         self._scene.setSceneRect(
             QRectF(-40, 0,
-                   self._lane_x(max(n.lane for n in self.graph.nodes) + 1) + self._padding,
+                   self._lane_x(max(n.lane_index for n in self.graph.nodes) + 1) + self._padding,
                    self._row_y(len(self.graph.nodes)) + self._padding)
         )
 

je_editor/utils/multi_language/english.py

@@ -110,10 +110,10 @@
     "tab_menu_stackoverflow_tab_name": "Stackoverflow",
     "tab_menu_ipython_tab_name": "IPython(Jupyter)",
     "tab_menu_chat_ui_tab_name": "ChatUI",
-    "tab_menu_git_client_tab_name": "GitClient",
-    "tab_menu_git_branch_tree_view_tab_name": "GitBranchTreeView",
-    "tab_menu_variable_inspector_tab_name": "VariableInspector",
-    "tab_menu_console_widget_tab_name": "ConsoleWidget",
+    "tab_menu_git_client_tab_name": "Git Client",
+    "tab_menu_git_branch_tree_view_tab_name": "Git BranchTreeViewer",
+    "tab_menu_variable_inspector_tab_name": "Variable Inspector",
+    "tab_menu_console_widget_tab_name": "Console Widget",
     # Text Menu
     "text_menu_label": "Text",
     "text_menu_label_font": "Font",

je_editor/utils/multi_language/traditional_chinese.py

@@ -104,9 +104,9 @@
     "tab_menu_stackoverflow_tab_name": "Stackoverflow",
     "tab_menu_ipython_tab_name": "IPython(Jupyter)",
     "tab_menu_chat_ui_tab_name": "ChatUI",
-    "tab_menu_git_client_tab_name": "GitClient",
-    "tab_menu_git_branch_tree_view_tab_name": "GitBranchTreeView",
-    "tab_menu_variable_inspector_tab_name": "VariableInspector",
+    "tab_menu_git_client_tab_name": "Git Client",
+    "tab_menu_git_branch_tree_view_tab_name": "Git BranchTreeViewer",
+    "tab_menu_variable_inspector_tab_name": "Variable Inspector",
     "tab_menu_console_widget_tab_name": "ConsoleWidget",
     # Text Menu
     "text_menu_label": "文字",

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor_dev"
-version = "0.0.233"
+version = "0.0.234"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]