git-push-time 1.1.2 → 1.1.4

package/lib/commands/pull.js

@@ -1,90 +1,90 @@
-import chalk from 'chalk';
-import { selectBox } from '../prompt-helpers.js';
-import {
-  checkGitInstalled,
-  isGitRepo,
-  getCurrentBranchStrict,
-  pullFromRemote,
-  resolveTargetDir
-} from '../git.js';
-import {
-  printSection,
-  printTargetDir,
-  printGitMissing,
-  printErrorBox,
-  printFooter
-} from '../ui.js';
-
-export async function runPullCommand(remote = 'origin', branch, options = {}) {
-  const fromMenu = options.fromMenu === true;
-
-  if (!checkGitInstalled()) {
-    printGitMissing();
-    if (fromMenu) return;
-    process.exit(1);
-  }
-
-  let targetDir = process.cwd();
-  if (options.dir) {
-    const r = resolveTargetDir(options.dir, process.cwd());
-    if (!r.ok) {
-      printErrorBox('THƯ MỤC KHÔNG HỢP LỆ', [r.error]);
-      if (fromMenu) return;
-      process.exit(1);
-    }
-    targetDir = r.fullPath;
-  }
-
-  if (!isGitRepo(targetDir)) {
-    printErrorBox('CHƯA PHẢI GIT REPOSITORY', [`Thư mục '${targetDir}' chưa phải Git repository.`]);
-    if (fromMenu) return;
-    process.exit(1);
-  }
-
-  if (!branch) {
-    branch = getCurrentBranchStrict(targetDir);
-  }
-
-  if (!branch) {
-    printErrorBox('KHÔNG XÁC ĐỊNH ĐƯỢC BRANCH', ['Đang ở detached HEAD nên không biết pull branch nào.'], 'Checkout về branch chính rồi chạy lại.');
-    if (fromMenu) return;
-    process.exit(1);
-  }
-
-  const isInteractive = !options.yes;
-  try {
-    printSection(`PULL --ff-only ${remote}/${branch}`);
-    printTargetDir(targetDir);
-    const result = pullFromRemote(remote, branch, targetDir);
-    console.log(chalk.hex('#34D399')(`  [OK] ${result || 'Repository đã cập nhật mới nhất (fast-forward).'}\n`));
-    if (!fromMenu) printFooter();
-  } catch (error) {
-    printErrorBox('PULL THẤT BẠI', [String(error.message).split('\n')[0]], 'Fast-forward thất bại khi lịch sử bị lệch. Có thể thử pull --rebase.');
-    if (!isInteractive) {
-      if (fromMenu) return;
-      process.exit(1);
-    }
-
-    const choice = await selectBox({
-      message: 'Pull fast-forward thất bại. Bạn muốn làm gì tiếp?',
-      hint: `git pull --rebase ${remote} ${branch}`,
-      choices: [
-        { name: 'Thử kéo về bằng pull --rebase', value: 'rebase', description: `git pull --rebase ${remote} ${branch}` },
-        { name: 'Quay lại', value: 'back', description: 'Về màn hình trước' },
-        { name: 'x Thoát', value: 'exit', description: 'Không làm gì thêm' }
-      ]
-    });
-
-    if (choice === 'rebase') {
-      try {
-        console.log(chalk.hex('#38BDF8')(`\n  » Đang chạy: git pull --rebase ${remote} ${branch}...`));
-        const out = pullFromRemote(remote, branch, targetDir, { rebase: true });
-        console.log(chalk.hex('#34D399')(`  [OK] Pull --rebase thành công! ${String(out).split('\n')[0].slice(0, 100)}\n`));
-        if (!fromMenu) printFooter();
-      } catch (rebaseErr) {
-        printErrorBox('PULL --REBASE THẤT BẠI', [String(rebaseErr.message).split('\n')[0]], 'Có thể bị xung đột code (conflict). Mở git status để giải quyết.');
-        if (!fromMenu) process.exit(1);
-      }
-    }
-  }
-}
+import chalk from 'chalk';
+import { selectBox } from '../prompt-helpers.js';
+import {
+  checkGitInstalled,
+  isGitRepo,
+  getCurrentBranchStrict,
+  pullFromRemote,
+  resolveTargetDir
+} from '../git.js';
+import {
+  printSection,
+  printTargetDir,
+  printGitMissing,
+  printErrorBox,
+  printFooter
+} from '../ui.js';
+
+export async function runPullCommand(remote = 'origin', branch, options = {}) {
+  const fromMenu = options.fromMenu === true;
+
+  if (!checkGitInstalled()) {
+    printGitMissing();
+    if (fromMenu) return;
+    process.exit(1);
+  }
+
+  let targetDir = process.cwd();
+  if (options.dir) {
+    const r = resolveTargetDir(options.dir, process.cwd());
+    if (!r.ok) {
+      printErrorBox('INVALID DIRECTORY', [r.error]);
+      if (fromMenu) return;
+      process.exit(1);
+    }
+    targetDir = r.fullPath;
+  }
+
+  if (!isGitRepo(targetDir)) {
+    printErrorBox('NOT A GIT REPOSITORY', [`'${targetDir}' is not a Git repository.`]);
+    if (fromMenu) return;
+    process.exit(1);
+  }
+
+  if (!branch) {
+    branch = getCurrentBranchStrict(targetDir);
+  }
+
+  if (!branch) {
+    printErrorBox('CANNOT DETERMINE BRANCH', ['HEAD is detached, so the branch to pull is unknown.'], 'Check out a branch and try again.');
+    if (fromMenu) return;
+    process.exit(1);
+  }
+
+  const isInteractive = !options.yes;
+  try {
+    printSection(`PULL --FF-ONLY ${remote}/${branch}`);
+    printTargetDir(targetDir);
+    const result = pullFromRemote(remote, branch, targetDir);
+    console.log(chalk.hex('#34D399')(`  [OK] ${result || 'Repository is up to date (fast-forward).'}\n`));
+    if (!fromMenu) printFooter();
+  } catch (error) {
+    printErrorBox('PULL FAILED', [String(error.message).split('\n')[0]], 'Fast-forward failed because the histories diverged. You can try pull --rebase.');
+    if (!isInteractive) {
+      if (fromMenu) return;
+      process.exit(1);
+    }
+
+    const choice = await selectBox({
+      message: 'Fast-forward pull failed. What would you like to do?',
+      hint: `git pull --rebase ${remote} ${branch}`,
+      choices: [
+        { name: 'Try pulling with rebase', value: 'rebase', description: `git pull --rebase ${remote} ${branch}` },
+        { name: 'Go back', value: 'back', description: 'Return to the previous screen' },
+        { name: 'Exit', value: 'exit', description: 'Stop here' }
+      ]
+    });
+
+    if (choice === 'rebase') {
+      try {
+        console.log(chalk.hex('#38BDF8')(`\n  » Running: git pull --rebase ${remote} ${branch}...`));
+        const out = pullFromRemote(remote, branch, targetDir, { rebase: true });
+        console.log(chalk.hex('#34D399')(`  [OK] Pull --rebase succeeded. ${String(out).split('\n')[0].slice(0, 100)}\n`));
+        if (!fromMenu) printFooter();
+      } catch (rebaseErr) {
+        printErrorBox('PULL --REBASE FAILED', [String(rebaseErr.message).split('\n')[0]], 'There may be merge conflicts. Run git status to review them.');
+        if (!fromMenu) process.exit(1);
+      }
+    }
+  }
+}