Skip to content

Commit 44e670f

Browse files
committed
Update dev version
Update dev version
1 parent 754354c commit 44e670f

File tree

17 files changed

+39
-39
lines changed

17 files changed

+39
-39
lines changed

exe/a.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
print("Hello World")
1+
print("Hello World")

je_editor/git/commit_graph.py renamed to je_editor/git_feature/commit_graph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CommitGraph:
2020
index: Dict[str, int] = field(default_factory=dict) # sha -> row
2121

2222
def build(self, commits: List[Dict], refs: Dict[str, str]) -> None:
23-
# commits are topo-ordered by git log --topo-order; we keep it.
23+
# commits are topo-ordered by git_feature log --topo-order; we keep it.
2424
self.nodes = [
2525
CommitNode(
2626
commit_sha=c["sha"],
@@ -35,7 +35,7 @@ def build(self, commits: List[Dict], refs: Dict[str, str]) -> None:
3535

3636
def _assign_lanes(self) -> None:
3737
"""
38-
Simple lane assignment similar to 'git log --graph' lanes.
38+
Simple lane assignment similar to 'git_feature log --graph' lanes.
3939
Greedy: reuse freed lanes; parents may create new lanes.
4040
"""
4141
active: Dict[int, str] = {} # lane -> sha

je_editor/git/git.py renamed to je_editor/git_feature/git.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ def stage_all(self):
104104
self._ensure_repo()
105105
try:
106106
self.repo.git.add(all=True)
107-
audit_log(self.repo_path, "stage_all", "git add -A", True)
107+
audit_log(self.repo_path, "stage_all", "git_feature add -A", True)
108108
except GitCommandError as e:
109-
audit_log(self.repo_path, "stage_all", "git add -A", False, str(e))
109+
audit_log(self.repo_path, "stage_all", "git_feature add -A", False, str(e))
110110
raise
111111

112112
def commit(self, message: str):

je_editor/git/git_cli.py renamed to je_editor/git_feature/git_cli.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ def __init__(self, repo_path: Path):
1111
self.repo_path = Path(repo_path)
1212

1313
def is_git_repo(self) -> bool:
14-
return (self.repo_path / ".git").exists()
14+
return (self.repo_path / ".git_feature").exists()
1515

1616
def _run(self, args: List[str]) -> str:
17-
log.debug("git %s", " ".join(args))
17+
log.debug("git_feature %s", " ".join(args))
1818
res = subprocess.run(
19-
["git"] + args,
19+
["git_feature"] + args,
2020
cwd=self.repo_path,
2121
stdout=subprocess.PIPE,
2222
stderr=subprocess.PIPE,
File renamed without changes.

je_editor/pyside_ui/code/code_process/code_exec.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def print_and_clear_queue(self) -> None:
197197
def read_program_output_from_process(self) -> None:
198198
jeditor_logger.info("ExecManager read_program_output_from_process")
199199
while self.still_run_program:
200-
program_output_data: str = self.process.stdout.read(
200+
program_output_data: str = self.process.stdout.readline(
201201
self.program_buffer).decode(self.program_encoding, "replace")
202202
if self.process:
203203
self.process.stdout.flush()
@@ -206,7 +206,7 @@ def read_program_output_from_process(self) -> None:
206206
def read_program_error_output_from_process(self) -> None:
207207
jeditor_logger.info("ExecManager read_program_error_output_from_process")
208208
while self.still_run_program:
209-
program_error_output_data: str = self.process.stderr.read(
209+
program_error_output_data: str = self.process.stderr.readline(
210210
self.program_buffer).decode(self.program_encoding, "replace")
211211
if self.process:
212212
self.process.stderr.flush()

je_editor/pyside_ui/code/shell_process/shell_exec.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def print_and_clear_queue(self) -> None:
179179
def read_program_output_from_process(self) -> None:
180180
jeditor_logger.info("ShellManager read_program_output_from_process")
181181
while self.still_run_shell:
182-
program_output_data = self.process.stdout.read(
182+
program_output_data = self.process.stdout.readline(
183183
self.program_buffer) \
184184
.decode(self.program_encoding, "replace")
185185
if self.process:
@@ -189,7 +189,7 @@ def read_program_output_from_process(self) -> None:
189189
def read_program_error_output_from_process(self) -> None:
190190
jeditor_logger.info("ShellManager read_program_error_output_from_process")
191191
while self.still_run_shell:
192-
program_error_output_data = self.process.stderr.read(
192+
program_error_output_data = self.process.stderr.readline(
193193
self.program_buffer) \
194194
.decode(self.program_encoding, "replace")
195195
if self.process:
File renamed without changes.

je_editor/pyside_ui/git/git_branch_tree_widget.py renamed to je_editor/pyside_ui/git_feature/git_branch_tree_widget.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
QSplitter, QWidget, QVBoxLayout
99
)
1010

11-
from je_editor.git.commit_graph import CommitGraph
12-
from je_editor.git.git_cli import GitCLI
13-
from je_editor.pyside_ui.git.commit_table import CommitTable
14-
from je_editor.pyside_ui.git.graph_view import CommitGraphView
11+
from je_editor.git_feature.commit_graph import CommitGraph
12+
from je_editor.git_feature.git_cli import GitCLI
13+
from je_editor.pyside_ui.git_feature.commit_table import CommitTable
14+
from je_editor.pyside_ui.git_feature.graph_view import CommitGraphView
1515
from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
1616

1717
logging.basicConfig(level=logging.INFO)
@@ -89,7 +89,7 @@ def _setup_watcher(self):
8989
self.watcher.removePaths(self.watcher.directories())
9090
if not self.repo_path:
9191
return
92-
git_dir = self.repo_path / ".git"
92+
git_dir = self.repo_path / ".git_feature"
9393
if git_dir.exists():
9494
self.watcher.addPath(str(git_dir))
9595
for f in ["HEAD", "packed-refs"]:

je_editor/pyside_ui/git/git_client_gui.py renamed to je_editor/pyside_ui/git_feature/git_client_gui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
QSizePolicy, QSplitter, QLineEdit, QVBoxLayout, QMessageBox, QFileDialog, QApplication, QInputDialog
77

88
from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
9-
from je_editor.git.git import Worker, GitService
10-
from je_editor.git.github import GitCloneHandler
9+
from je_editor.git_feature.git import Worker, GitService
10+
from je_editor.git_feature.github import GitCloneHandler
1111

1212

1313
class Gitgui(QWidget):

0 commit comments

Comments
 (0)