Skip to content

Commit b90e320

Browse files
vHandavHanda
committed
test: Remove the whole Directory.current hack
We now pass the working directory via a parameter. This has exposed a number of issues all over, which have now all been fixed. The hack was also occasionally failing and causing issues. I'm glad it failed as it exposed all these other issues.
1 parent c5d2f09 commit b90e320

27 files changed

+212
-137
lines changed

‎bin/commands/add.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/git.dart';
@@ -13,10 +11,14 @@ class AddCommand extends Command<int> {
1311
@override
1412
final description = 'Add file contents to the index';
1513

14+
final String currentDir;
15+
16+
AddCommand(this.currentDir);
17+
1618
@override
1719
int run() {
1820
// FIXME: if gitRootDir is not valid give an error!
19-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
21+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2022
var repo = GitRepository.load(gitRootDir);
2123

2224
var pathSpec = argResults!.arguments[0];

‎bin/commands/branch.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/git.dart';
@@ -15,15 +13,17 @@ class BranchCommand extends Command<int> {
1513
@override
1614
final description = 'List, create, or delete branches';
1715

18-
BranchCommand() {
16+
final String currentDir;
17+
18+
BranchCommand(this.currentDir) {
1919
argParser.addOption('set-upstream-to');
2020
argParser.addFlag('all', abbr: 'a', defaultsTo: false);
2121
argParser.addFlag('delete', abbr: 'd', defaultsTo: false);
2222
}
2323

2424
@override
2525
int run() {
26-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
26+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2727
var repo = GitRepository.load(gitRootDir);
2828

2929
var showAll = argResults!['all'] as bool?;

‎bin/commands/cat_file.dart

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore_for_file: avoid_print
22

33
import 'dart:convert';
4-
import 'dart:io';
54

65
import 'package:args/command_runner.dart';
76

@@ -16,9 +15,13 @@ class CatFileCommand extends Command<int> {
1615
final description =
1716
'Provide content or type and size information for repository objects';
1817

18+
final String currentDir;
19+
20+
CatFileCommand(this.currentDir);
21+
1922
@override
2023
int run() {
21-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
24+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2225
var repo = GitRepository.load(gitRootDir);
2326

2427
var objectSha1 = argResults!.arguments[1];

‎bin/commands/checkout.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/git.dart';
@@ -15,13 +13,15 @@ class CheckoutCommand extends Command<int> {
1513
@override
1614
final description = 'Switch branches or restore working tree files';
1715

18-
CheckoutCommand() {
16+
final String currentDir;
17+
18+
CheckoutCommand(this.currentDir) {
1919
argParser.addOption('branch', abbr: 'b', defaultsTo: '');
2020
}
2121

2222
@override
2323
int run() {
24-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
24+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2525
var repo = GitRepository.load(gitRootDir);
2626

2727
var branchName = argResults!['branch'] as String;

‎bin/commands/diff.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/diff_commit.dart';
@@ -16,7 +14,9 @@ class DiffCommand extends Command<int> {
1614
final description =
1715
'Show changes between commits, commit and working tree, etc';
1816

19-
DiffCommand() {
17+
final String currentDir;
18+
19+
DiffCommand(this.currentDir) {
2020
argParser.addFlag('raw');
2121
}
2222

@@ -28,7 +28,7 @@ class DiffCommand extends Command<int> {
2828
return 1;
2929
}
3030

31-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
31+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
3232
var repo = GitRepository.load(gitRootDir);
3333

3434
var fromStr = argResults!.arguments[0];

‎bin/commands/diff_tree.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/diff_tree.dart';
@@ -17,9 +15,13 @@ class DiffTreeCommand extends Command<int> {
1715
final description =
1816
'Compares the content and mode of blobs found via two tree objects';
1917

18+
final String currentDir;
19+
20+
DiffTreeCommand(this.currentDir);
21+
2022
@override
2123
int run() {
22-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
24+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2325
var repo = GitRepository.load(gitRootDir);
2426

2527
var hash = argResults!.arguments[0];

‎bin/commands/dump_index.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/git.dart';
@@ -13,9 +11,13 @@ class DumpIndexCommand extends Command<int> {
1311
@override
1412
final description = 'Prints the contents of the .git/index';
1513

14+
final String currentDir;
15+
16+
DumpIndexCommand(this.currentDir);
17+
1618
@override
1719
int run() {
18-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
20+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
1921
var repo = GitRepository.load(gitRootDir);
2022

2123
var index = repo.indexStorage.readIndex();

‎bin/commands/hash_object.dart

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import 'dart:io';
44

55
import 'package:args/command_runner.dart';
6+
import 'package:path/path.dart' as p;
67

78
import 'package:dart_git/git.dart';
89
import 'package:dart_git/plumbing/git_hash.dart';
@@ -16,7 +17,9 @@ class HashObjectCommand extends Command<int> {
1617
final description =
1718
'Compute object ID and optionally creates a blob from a file';
1819

19-
HashObjectCommand() {
20+
final String currentDir;
21+
22+
HashObjectCommand(this.currentDir) {
2023
argParser.addOption(
2124
'type',
2225
abbr: 't',
@@ -39,10 +42,13 @@ class HashObjectCommand extends Command<int> {
3942
return 1;
4043
}
4144
var filePath = argResults!.rest[0];
45+
if (!File(filePath).existsSync()) {
46+
filePath = p.join(currentDir, filePath);
47+
}
4248
var rawData = File(filePath).readAsBytesSync();
4349
var hash = GitHash.compute(rawData);
4450

45-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
51+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
4652
var repo = GitRepository.load(gitRootDir);
4753

4854
var fmt = argResults!['type'] as String;

‎bin/commands/init.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ class InitCommand extends Command<int> {
1313
final description =
1414
'Create an empty Git repository or reinitialize an existing one';
1515

16-
InitCommand() {
16+
final String currentDir;
17+
18+
InitCommand(this.currentDir) {
1719
argParser.addFlag('quiet', abbr: 'q', defaultsTo: false);
1820
argParser.addOption('initial-branch', abbr: 'b', defaultsTo: 'main');
1921
}
@@ -25,7 +27,7 @@ class InitCommand extends Command<int> {
2527
return 1;
2628
}
2729

28-
var path = argResults!.rest.first;
30+
var path = p.join(currentDir, argResults!.rest.first);
2931
var defaultBranch = argResults!['initial-branch'] as String;
3032
GitRepository.init(path, defaultBranch: defaultBranch);
3133

‎bin/commands/log.dart

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// ignore_for_file: avoid_print
22

33
import 'dart:convert';
4-
import 'dart:io';
54

65
import 'package:args/command_runner.dart';
76

@@ -17,9 +16,13 @@ class LogCommand extends Command<int> {
1716
@override
1817
final description = 'Show commit logs';
1918

19+
final String currentDir;
20+
21+
LogCommand(this.currentDir);
22+
2023
@override
2124
int run() {
22-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
25+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2326
var repo = GitRepository.load(gitRootDir);
2427

2528
GitHash? sha;

‎bin/commands/ls_tree.dart

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/git.dart';
@@ -16,11 +14,15 @@ class LsTreeCommand extends Command<int> {
1614
@override
1715
final description = 'List the contents of a tree object';
1816

17+
final String currentDir;
18+
19+
LsTreeCommand(this.currentDir);
20+
1921
@override
2022
int run() {
2123
var objectSha1 = argResults!.rest.first;
2224

23-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
25+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2426
var repo = GitRepository.load(gitRootDir);
2527

2628
var objRes = repo.objStorage.read(GitHash(objectSha1));

‎bin/commands/merge.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ class MergeCommand extends Command<int> {
1414
@override
1515
final description = 'Join two or more development histories together';
1616

17-
MergeCommand() {
17+
final String currentDir;
18+
19+
MergeCommand(this.currentDir) {
1820
argParser.addOption('strategy-option', abbr: 'X');
1921
argParser.addOption('message', abbr: 'm');
2022
}
@@ -28,7 +30,7 @@ class MergeCommand extends Command<int> {
2830
}
2931

3032
var branchName = args[0];
31-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
33+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
3234
var repo = GitRepository.load(gitRootDir);
3335
var branchCommit = repo.branchCommit(branchName);
3436
if (branchCommit == null) {

‎bin/commands/merge_base.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/git.dart';
@@ -14,7 +12,9 @@ class MergeBaseCommand extends Command<int> {
1412
@override
1513
final description = 'Find as good common ancestors as possible for a merge';
1614

17-
MergeBaseCommand() {
15+
final String currentDir;
16+
17+
MergeBaseCommand(this.currentDir) {
1818
argParser.addFlag('independent', defaultsTo: false);
1919
}
2020

@@ -26,7 +26,7 @@ class MergeBaseCommand extends Command<int> {
2626
return 1;
2727
}
2828

29-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
29+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
3030
var repo = GitRepository.load(gitRootDir);
3131

3232
var aHash = GitHash(args[0]);

‎bin/commands/mtime_builder.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/command_runner.dart';
64

75
import 'package:dart_git/file_mtime_builder.dart';
@@ -14,13 +12,15 @@ class MTimeBuilderCommand extends Command<int> {
1412
@override
1513
final description = 'Internal Dart-Git tools';
1614

17-
MTimeBuilderCommand() {
15+
final String currentDir;
16+
17+
MTimeBuilderCommand(this.currentDir) {
1818
argParser.addFlag('debug', abbr: 'd', defaultsTo: false);
1919
}
2020

2121
@override
2222
int run() {
23-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
23+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2424
var repo = GitRepository.load(gitRootDir);
2525

2626
var builder = FileMTimeBuilder();

‎bin/commands/remote.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// ignore_for_file: avoid_print
22

3-
import 'dart:io';
4-
53
import 'package:args/args.dart';
64
import 'package:args/command_runner.dart';
75

@@ -17,15 +15,17 @@ class RemoteCommand extends Command<int> {
1715
final ArgParser addArgParser = ArgParser();
1816
final ArgParser rmArgParser = ArgParser();
1917

20-
RemoteCommand() {
18+
final String currentDir;
19+
20+
RemoteCommand(this.currentDir) {
2121
argParser.addFlag('verbose', abbr: 'v', defaultsTo: false);
2222
argParser.addCommand('add', addArgParser);
2323
argParser.addCommand('rm', rmArgParser);
2424
}
2525

2626
@override
2727
int run() {
28-
var gitRootDir = GitRepository.findRootDir(Directory.current.path)!;
28+
var gitRootDir = GitRepository.findRootDir(currentDir)!;
2929
var repo = GitRepository.load(gitRootDir);
3030

3131
var verbose = argResults!['verbose'] as bool?;

0 commit comments

Comments
 (0)