feat: extend existing commands with missing flags and options

- log: --oneline (short hash + first line), --all (walk all refs)
- diff: <commit>..<commit> (compare two commits), --stat (diffstat
  summary), --name-only (just file paths)
- status: -s/--short (XY path compact format)
- show: --stat and --name-only for commit objects
- branch: -m (rename with config migration), -a (list local + remote),
  --set-upstream-to (set tracking branch)
- checkout: -- <file> (restore file from HEAD)

15 new functional tests (260 total, 754 assertions).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Lukáš Kříž

src/Application/Handler/BranchHandler.php

@@ -39,6 +39,63 @@ public function list(): array
         return $this->repository->refs->listRefs('refs/heads/');
     }
 
+    public function rename(string $oldName, string $newName): void
+    {
+        $oldRef = RefName::branch($oldName);
+        $newRef = RefName::branch($newName);
+
+        if (! $this->repository->refs->exists($oldRef)) {
+            throw new PureGitException(sprintf('Branch not found: %s', $oldName));
+        }
+
+        if ($this->repository->refs->exists($newRef)) {
+            throw new PureGitException(sprintf('Branch already exists: %s', $newName));
+        }
+
+        $id = $this->repository->refs->resolve($oldRef);
+        $this->repository->refs->updateRef($newRef, $id);
+        $this->repository->refs->deleteRef($oldRef);
+
+        // Update HEAD if renaming the current branch
+        $currentBranch = $this->getCurrentBranch();
+        if ($currentBranch instanceof RefName && $currentBranch->equals($oldRef)) {
+            $this->repository->refs->updateSymbolicRef(RefName::head(), $newRef);
+        }
+
+        // Migrate tracking config
+        $this->migrateTrackingConfig($oldName, $newName);
+    }
+
+    /**
+     * @return array<string, ObjectId>
+     */
+    public function listRemote(): array
+    {
+        return $this->repository->refs->listRefs('refs/remotes/');
+    }
+
+    public function setUpstreamTo(string $upstream, ?string $branchName = null): void
+    {
+        if ($branchName === null) {
+            $current = $this->getCurrentBranch();
+            if (! $current instanceof RefName) {
+                throw new PureGitException('HEAD is not on a branch');
+            }
+            $branchName = $current->shortName();
+        }
+
+        if (! str_contains($upstream, '/')) {
+            throw new PureGitException(sprintf('Not a valid upstream: %s', $upstream));
+        }
+
+        $parts = explode('/', $upstream, 2);
+        $configPath = $this->repository->gitDir . '/config';
+        $section = 'branch "' . $branchName . '"';
+        $writer = new GitConfigWriter();
+        $writer->set($configPath, $section, 'remote', $parts[0]);
+        $writer->set($configPath, $section, 'merge', 'refs/heads/' . $parts[1]);
+    }
+
     public function delete(string $name): void
     {
         $ref = RefName::branch($name);
@@ -159,4 +216,24 @@ private function collectAncestors(ObjectId $startId): array
 
         return $visited;
     }
+
+    private function migrateTrackingConfig(string $oldName, string $newName): void
+    {
+        $configPath = $this->repository->gitDir . '/config';
+        $config = new GitConfigReader($configPath);
+        $oldSection = 'branch "' . $oldName . '"';
+        $remote = $config->get($oldSection, 'remote');
+        $merge = $config->get($oldSection, 'merge');
+
+        if ($remote === null || $merge === null) {
+            return;
+        }
+
+        $writer = new GitConfigWriter();
+        $newSection = 'branch "' . $newName . '"';
+        $writer->set($configPath, $newSection, 'remote', $remote);
+        $writer->set($configPath, $newSection, 'merge', $merge);
+        $writer->unsetKey($configPath, $oldSection, 'remote');
+        $writer->unsetKey($configPath, $oldSection, 'merge');
+    }
 }

src/Application/Handler/LogHandler.php

@@ -19,14 +19,15 @@ public function __construct(
     /**
      * @return list<Commit>
      */
-    public function handle(int $maxCount = 20, ?string $fromRef = null): array
+    public function handle(int $maxCount = 20, ?string $fromRef = null, bool $all = false): array
     {
-        $ref = $fromRef !== null ? RefName::fromString($fromRef) : RefName::head();
-        $commitId = $this->repository->refs->resolve($ref);
+        $startIds = $all ? $this->allRefIds() : [$this->repository->refs->resolve(
+            $fromRef !== null ? RefName::fromString($fromRef) : RefName::head(),
+        )];
 
         $commits = [];
         $seen = [];
-        $queue = [$commitId];
+        $queue = $startIds;
 
         while ($queue !== [] && count($commits) < $maxCount) {
             $id = array_shift($queue);
@@ -44,9 +45,30 @@ public function handle(int $maxCount = 20, ?string $fromRef = null): array
             $this->enqueueUnseen($commit->parents, $seen, $queue);
         }
 
+        usort($commits, static fn (Commit $a, Commit $b): int => $b->author->timestamp->getTimestamp() - $a->author->timestamp->getTimestamp());
+
         return $commits;
     }
 
+    /**
+     * @return list<ObjectId>
+     */
+    private function allRefIds(): array
+    {
+        $allRefs = $this->repository->refs->listRefs('refs/');
+        $ids = [];
+        $seen = [];
+
+        foreach ($allRefs as $id) {
+            if (! isset($seen[$id->hash])) {
+                $seen[$id->hash] = true;
+                $ids[] = $id;
+            }
+        }
+
+        return $ids;
+    }
+
     private function readCommit(ObjectId $id): ?Commit
     {
         $object = $this->repository->objects->read($id);

src/CLI/Command/BranchCommand.php

@@ -21,7 +21,7 @@ public function description(): string
 
     public function usage(): string
     {
-        return 'branch [<name>] [-d <name>] [--unset-upstream [<name>]]';
+        return 'branch [<name>] [-d <name>] [-m <old> <new>] [-a] [--set-upstream-to=<upstream>] [--unset-upstream [<name>]]';
     }
 
     /**
@@ -39,43 +39,61 @@ public function execute(array $args): int
         $repo = Repository::discover($cwd);
         $handler = new BranchHandler($repo);
 
-        if ($this->isUnsetUpstreamRequest($args)) {
-            return $this->unsetUpstream($handler, $args[1] ?? null);
-        }
-
-        if ($this->isDeleteRequest($args)) {
-            return $this->deleteBranch($handler, $args[1]);
-        }
-
-        if ($this->isCreateRequest($args)) {
-            return $this->createBranch($handler, $args[0]);
-        }
-
-        return $this->listBranches($handler);
+        return $this->dispatch($handler, $args);
     }
 
     /**
      * @param list<string> $args
      */
-    private function isUnsetUpstreamRequest(array $args): bool
+    private function dispatch(BranchHandler $handler, array $args): int
     {
-        return isset($args[0]) && $args[0] === '--unset-upstream';
+        if ($args === []) {
+            return $this->listBranches($handler, false);
+        }
+
+        return match ($args[0]) {
+            '--unset-upstream' => $this->unsetUpstream($handler, $args[1] ?? null),
+            '-d' => isset($args[1]) ? $this->deleteBranch($handler, $args[1]) : 1,
+            '-m' => isset($args[1], $args[2]) ? $this->renameBranch($handler, $args[1], $args[2]) : 1,
+            '-a' => $this->listBranches($handler, true),
+            default => $this->handleDefault($handler, $args),
+        };
     }
 
     /**
      * @param list<string> $args
      */
-    private function isDeleteRequest(array $args): bool
+    private function handleDefault(BranchHandler $handler, array $args): int
     {
-        return isset($args[0]) && $args[0] === '-d' && isset($args[1]);
+        $setUpstream = $this->extractSetUpstreamTo($args);
+        if ($setUpstream !== null) {
+            $handler->setUpstreamTo($setUpstream);
+            $current = $handler->getCurrentBranch();
+            $branchName = $current instanceof \Lukasojd\PureGit\Domain\Ref\RefName ? $current->shortName() : 'HEAD';
+            fwrite(STDOUT, sprintf("branch '%s' set up to track '%s'.\n", $branchName, $setUpstream));
+
+            return 0;
+        }
+
+        if (isset($args[0]) && $args[0] !== '' && $args[0][0] !== '-') {
+            return $this->createBranch($handler, $args[0]);
+        }
+
+        return $this->listBranches($handler, false);
     }
 
     /**
      * @param list<string> $args
      */
-    private function isCreateRequest(array $args): bool
+    private function extractSetUpstreamTo(array $args): ?string
     {
-        return isset($args[0]) && $args[0] !== '' && $args[0][0] !== '-';
+        foreach ($args as $arg) {
+            if (str_starts_with($arg, '--set-upstream-to=')) {
+                return substr($arg, strlen('--set-upstream-to='));
+            }
+        }
+
+        return null;
     }
 
     private function unsetUpstream(BranchHandler $handler, ?string $name): int
@@ -93,6 +111,14 @@ private function deleteBranch(BranchHandler $handler, string $name): int
         return 0;
     }
 
+    private function renameBranch(BranchHandler $handler, string $oldName, string $newName): int
+    {
+        $handler->rename($oldName, $newName);
+        fwrite(STDOUT, sprintf("Branch '%s' renamed to '%s'\n", $oldName, $newName));
+
+        return 0;
+    }
+
     private function createBranch(BranchHandler $handler, string $name): int
     {
         $handler->create($name);
@@ -101,7 +127,7 @@ private function createBranch(BranchHandler $handler, string $name): int
         return 0;
     }
 
-    private function listBranches(BranchHandler $handler): int
+    private function listBranches(BranchHandler $handler, bool $all): int
     {
         $branches = $handler->list();
         $currentBranch = $handler->getCurrentBranch();
@@ -113,6 +139,14 @@ private function listBranches(BranchHandler $handler): int
             fwrite(STDOUT, sprintf("%s%s\n", $prefix, $short));
         }
 
+        if ($all) {
+            $remotes = $handler->listRemote();
+            foreach (array_keys($remotes) as $refName) {
+                $short = str_replace('refs/', '', $refName);
+                fwrite(STDOUT, sprintf("  %s\n", $short));
+            }
+        }
+
         return 0;
     }
 }

src/CLI/Command/CheckoutCommand.php

@@ -23,7 +23,7 @@ public function description(): string
 
     public function usage(): string
     {
-        return 'checkout [-b <new-branch>] <branch|commit>';
+        return 'checkout [-b <new-branch>] [-- <file>...] <branch|commit>';
     }
 
     /**
@@ -47,23 +47,59 @@ public function execute(array $args): int
         $repo = Repository::discover($cwd);
         $handler = new CheckoutHandler($repo);
 
+        return $this->dispatch($handler, $repo, $args);
+    }
+
+    /**
+     * @param list<string> $args
+     */
+    private function dispatch(CheckoutHandler $handler, Repository $repo, array $args): int
+    {
+        if ($this->tryRestoreFiles($handler, $args)) {
+            return 0;
+        }
+
         if ($args[0] === '-b') {
-            if (! isset($args[1])) {
-                fwrite(STDERR, "error: switch 'b' requires a value\n");
+            return $this->handleNewBranch($handler, $repo, $args);
+        }
 
-                return 1;
-            }
+        $result = $handler->checkout($args[0]);
+        $this->printResult($result, $args[0], $repo);
 
-            $startPoint = $args[2] ?? null;
-            $result = $handler->checkoutNewBranch($args[1], $startPoint);
-            $this->printResult($result, $args[1], $repo);
+        return 0;
+    }
 
-            return 0;
+    /**
+     * @param list<string> $args
+     */
+    private function tryRestoreFiles(CheckoutHandler $handler, array $args): bool
+    {
+        $dashDash = array_search('--', $args, true);
+        if ($dashDash === false || ! isset($args[$dashDash + 1])) {
+            return false;
         }
 
-        $result = $handler->checkout($args[0]);
+        for ($i = $dashDash + 1, $iMax = count($args); $i < $iMax; $i++) {
+            $handler->restoreFile($args[$i]);
+        }
 
-        $this->printResult($result, $args[0], $repo);
+        return true;
+    }
+
+    /**
+     * @param list<string> $args
+     */
+    private function handleNewBranch(CheckoutHandler $handler, Repository $repo, array $args): int
+    {
+        if (! isset($args[1])) {
+            fwrite(STDERR, "error: switch 'b' requires a value\n");
+
+            return 1;
+        }
+
+        $startPoint = $args[2] ?? null;
+        $result = $handler->checkoutNewBranch($args[1], $startPoint);
+        $this->printResult($result, $args[1], $repo);
 
         return 0;
     }