flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-27 01:02:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move cloning logic to its own file

Browse Source 
This has gotten very complex and needs to be properly tested. It's the
number 1 bug.
This commit is contained in:
Vishesh Handa
2021-01-19 14:05:51 +01:00
parent 9946993364
commit 4c7efdb2dc
5 changed files with 94 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/core/git_repo.dart
View File

@ -241,20 +241,6 @@ class GitNoteRepository {
}
}
Future<String> defaultBranch(String remoteName) async {
try {
return await _gitRepo.defaultBranch(
remote: remoteName,
publicKey: settings.sshPublicKey,
privateKey: settings.sshPrivateKey,
password: settings.sshPassword,
);
} on GitException catch (ex, stackTrace) {
Log.e("GitDefaultBranch Failed", ex: ex, stacktrace: stackTrace);
rethrow;
}
}
Future<int> numChanges() async {
try {
var repo = await git.GitRepository.load(gitDirPath);

48
lib/repository.dart
View File

@ -403,54 +403,6 @@ class Repository with ChangeNotifier {
_gitRepo = GitNoteRepository(gitDirPath: repoPath, settings: settings);
var repo = await GitRepository.load(repoPath);
var remote = repo.config.remote(remoteName);
var remoteBranchName = "master";
try {
remoteBranchName = await _gitRepo.defaultBranch(remoteName);
} catch (ex) {
Log.w("Could not get git main branch - assuming master", ex: ex);
}
var remoteBranch = await repo.remoteBranch(remoteName, remoteBranchName);
Log.i("Using remote branch: $remoteBranchName");
var branches = await repo.branches();
if (branches.isEmpty) {
Log.i("Completing - no local branch");
if (remoteBranchName != null &&
remoteBranchName.isNotEmpty &&
remoteBranch != null) {
await repo.checkoutBranch(remoteBranchName, remoteBranch.hash);
}
await repo.setUpstreamTo(remote, remoteBranchName);
} else {
var branch = branches[0];
if (branch == remoteBranchName) {
Log.i("Completing - localBranch: $branch");
await repo.setUpstreamTo(remote, remoteBranchName);
await _gitRepo.merge();
} else {
Log.i(
"Completing - localBranch diff remote: $branch $remoteBranchName");
var headRef = await repo.resolveReference(await repo.head());
await repo.checkoutBranch(remoteBranchName, headRef.hash);
await repo.deleteBranch(branch);
await repo.setUpstreamTo(remote, remoteBranchName);
await _gitRepo.merge();
}
// if more than one branch
// TODO: Check if one of the branches matches the remote branch name
// and use that
// if not, then just create a new branch with the remoteBranchName
// and merge ..
}
await _addFileInRepo(repo: this, settings: settings);
this.repoPath = repoPath;

82
lib/setup/clone.dart Normal file
View File

@ -0,0 +1,82 @@
import 'package:dart_git/dart_git.dart';
import 'package:git_bindings/git_bindings.dart' as git_bindings;
import 'package:meta/meta.dart';
import 'package:gitjournal/utils/logger.dart';
Future<void> cloneRemote({
@required String repoPath,
@required String cloneUrl,
@required String remoteName,
@required String sshPublicKey,
@required String sshPrivateKey,
@required String sshPassword,
}) async {
var repo = await GitRepository.load(repoPath);
// FIXME: In the case of no remotes and no commits, revert to clone?
var remote = await repo.addOrUpdateRemote(remoteName, cloneUrl);
var _gitRepo = git_bindings.GitRepo(folderPath: repoPath);
await _gitRepo.fetch(
remote: remoteName,
publicKey: sshPublicKey,
privateKey: sshPrivateKey,
password: sshPassword,
);
var remoteBranchName = "master";
try {
var branch = await _gitRepo.defaultBranch(
remote: remoteName,
publicKey: sshPublicKey,
privateKey: sshPrivateKey,
password: sshPassword,
);
if (branch != null && branch.isNotEmpty) {
Log.i("Got default branch: $branch");
remoteBranchName = branch;
}
} catch (ex) {
Log.w("Could not get git main branch - assuming master", ex: ex);
}
var remoteBranch = await repo.remoteBranch(remoteName, remoteBranchName);
Log.i("Using remote branch: $remoteBranchName");
var branches = await repo.branches();
if (branches.isEmpty) {
Log.i("Completing - no local branch");
if (remoteBranchName != null &&
remoteBranchName.isNotEmpty &&
remoteBranch != null) {
await repo.checkoutBranch(remoteBranchName, remoteBranch.hash);
}
await repo.setUpstreamTo(remote, remoteBranchName);
} else {
var branch = branches[0];
if (branch == remoteBranchName) {
Log.i("Completing - localBranch: $branch");
await repo.setUpstreamTo(remote, remoteBranchName);
await _gitRepo.merge();
} else {
Log.i("Completing - localBranch diff remote: $branch $remoteBranchName");
var headRef = await repo.resolveReference(await repo.head());
await repo.checkoutBranch(remoteBranchName, headRef.hash);
await repo.deleteBranch(branch);
await repo.setUpstreamTo(remote, remoteBranchName);
await _gitRepo.merge();
}
// if more than one branch
// TODO: Check if one of the branches matches the remote branch name
// and use that
// if not, then just create a new branch with the remoteBranchName
// and merge ..
}
}

19
lib/setup/screens.dart
View File

@ -20,6 +20,7 @@ import 'package:gitjournal/repository.dart';
import 'package:gitjournal/settings.dart';
import 'package:gitjournal/setup/autoconfigure.dart';
import 'package:gitjournal/setup/button.dart';
import 'package:gitjournal/setup/clone.dart';
import 'package:gitjournal/setup/clone_url.dart';
import 'package:gitjournal/setup/loading_error.dart';
import 'package:gitjournal/setup/repo_selector.dart';
@ -525,18 +526,16 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
String error;
try {
var repo = await GitRepository.load(repoPath);
await repo.addOrUpdateRemote(widget.remoteName, _gitCloneUrl);
var repoN = git_bindings.GitRepo(folderPath: repoPath);
await repoN.fetch(
remote: widget.remoteName,
publicKey: settings.sshPublicKey,
privateKey: settings.sshPrivateKey,
password: settings.sshPassword,
await cloneRemote(
cloneUrl: _gitCloneUrl,
remoteName: widget.remoteName,
repoPath: repoPath,
sshPassword: settings.sshPassword,
sshPrivateKey: settings.sshPrivateKey,
sshPublicKey: settings.sshPublicKey,
);
} on Exception catch (e, stacktrace) {
Log.e("Failed to add remote", ex: e, stacktrace: stacktrace);
Log.e("Failed to clone", ex: e, stacktrace: stacktrace);
error = e.toString();
}

8
pubspec.lock
View File

@ -477,11 +477,9 @@ packages:
git_bindings:
dependency: "direct main"
description:
path: "."
ref: HEAD
resolved-ref: "89c587037dd4d9d9270b09b51df40e537d7263c5"
url: "https://github.com/GitJournal/git_bindings.git"
source: git
path: "/Users/vishesh/src/gitjournal/git_bindings"
relative: false
source: path
version: "0.0.18"
git_url_parse2:
dependency: "direct main"