Fix PR #3598 : Auto init non-git repository (part 2) by KaKi87 · Pull Request #3599 · gitthermal/thermal

KaKi87 · 2019-12-25T19:56:07Z

Fixes #3598

Chore/add nodegit

feat/git-auto-init-repository-2

mittalyashu · 2019-12-31T11:29:40Z

I tested the fix locally on my machine.

Seems like everything is working fine, except the button status is not getting updated when autoInit is enabled.

Please see this video.

KaKi87 · 2019-12-31T11:57:01Z

I see. However, this is out of this PR's scope.
Could you please merge this one and close #3598 then I'll be working on a fix for this button ?
Thanks

mittalyashu · 2020-01-01T04:31:06Z

That button issue is surely a part of this PR, could you please add a fix for the same.

KaKi87 · 2020-01-01T13:01:23Z

The bug you're describing predates this PR.

mittalyashu · 2020-01-05T09:43:01Z

I understand what you mean, that this PR title describes to add feature to auto-initialise the git repository, in addition to that initialising the git repository from button is also a part of it.

mittalyashu

@KaKi87 Can you please look into these changes, after then I think we're good with merging it.

mittalyashu · 2020-01-18T12:08:34Z

+				if (!repository && autoInitFeature) {
+					gitInit({ path });
+				}
 				this.newRepository.isGitRepo = !!repository;


Suggested change

this.newRepository.isGitRepo = !!repository;

this.newRepository.isGitRepo = true;

I tried few ways to get the Repository {} object, seems like it not working. So for now we go with hard-coded true value.

Not the best option, I know, but I will look into improving the gitInit() API further.

mittalyashu · 2020-01-18T12:10:36Z

-		async gitInit(path) {
-			await gitInit({ path });
-			this.addRepositoryToDatabase(path);
+			this.addRepositoryToDatabase(repositoryPath);


Suggested change

this.addRepositoryToDatabase(repositoryPath);

this.addRepositoryToDatabase(repositoryPath);

Can you move this before closing the modal?

mittalyashu · 2020-01-18T12:11:29Z

+				{ $repositoryId: this.repositoryId },
 				(err, data) => {
 					if (err) console.log(err);
 					else this.isGit = 1;


Suggested change

else this.isGit = 1;

else this.queryAllRepository();

Also, don't forget to import the required mixin for the same.

KaKi87 · 2020-01-18T13:59:31Z

@KaKi87 Can you please look into these changes, after then I think we're good with merging it.

Again, your changes request would only be justified if my PR was creating regressions, which is not the case.

Please let's work step-by-step.

KaKi87 · 2020-01-22T14:31:15Z

Finally.
I'll start working on the several issues you talked about.

Incase error event a message can be shown inside the modal. Reference: #3599 (comment)

Creating a updateIsGitStatus mutation to update isGit value inside repository vuex store. Database is updated with the required changes with vuex is unaware of the changes which causes is bug to show repository as `isGit: false`. Reference: #3599 (comment)

* Initialize Git repository (nodegit) (#3509) * Install NodeGit package * Fix nodegit package installation (#3512) * Change node_version to 10.16.0 * Define node & electron engines in package.json * FIX: Add comma after node version engine * Switch back to latest version of Node@10 * Split script command yarn and yarn build:window * Update "postinstall" script command to install electron app deps * Install electron app native deps * Merge yarn && yarn postinstall && yarn build:linux command * Test windows pipeline with npm * Upgrade nodegit & electron-builder package * Run pipeline in npm * Run audit fix * Run install && audit fix * install & audit fix & postinstall & build:window * Update build description * Move yarn to npm * Update echo command * Remove electron from engines * Update npm registry url * Initialize repo using nodegit * Use promise instead of async * git status (nodegit) * fix: switchRepository mutation to toggle modal * Remove remote refs & validate git repository Remove function for getting remote url on adding repository and only validate git repository. * Add getBranchName function using nodegit * Add source column to db table Source column tells the source of repository (local or remote repo) * git status and get file status type Getting repository git status along with each file type, symbol, and color. * Query repository data on route (enter & update) * Clear repositoryData on routeLeave * Update projectId to repositoryId (route params) * Add repositoryData state, getters, and mutation * Show branch name and working changes * Move to next page after database data * Show staged files in workspace * Query repository & repositorySettings features data * Remove refs from workspace * Move to status-list component Remove fileChangesSkeleton and use status-list component * Create status item component * Remove branchName parmas from workspace route * Pass branchName as props to commit-message * NodeGit + SQLite migration : implement clone feature (#3589) * Use nodegit * Use database * Add cloning progress * Run ESLint * Remove workspace vuex store * Emit stagedFile to statusList component Storing all the statusList component inside stagedFile local data property. * Change projectId to repositoryId Repository ID is unique ID assigned to each repository from SQLite database. * Show repo path in switch repo modal * Set default branchName to "master" * Remove getFeatureValue computed property * Get repository data using mixin Using repositoryData.js as mixin to get data from repository.js vuex store as repositoryData computed property. * Git remote functions Add these 3 remote functions * getRemoteListNames * getRemoteUrl * addRemoteUrl * Remove branchName as route props * Query remoteUrl from db Fetch remote url from database on entering repository route * Save remote url to db on adding repository * Update add remote url with nodegit * store filePreview value locally data property filePreview is a local data property stored in `workspace.vue` to toggle view for diff preview component with blankSlate component * adjust workspace files width * Remove file diff preview method * refactor: remove unused code * Remove spacingProps, import repositoryData * Update repositoryData computed property data * Update to repositoryId & remove branchName params * Remove event.preventDefault() * Remove repositoryDataMixin import from settings.vue * Update remoteUrl on saveSettings method Update remoteUrl to database on running the saveSettings() method * Git fetch functions * pullRemoteBranch function * Add gitFetch method to navbar * Update directoryPath arguments (openTerminal & openFileExplorer) * Update gitPull method with nodegit * Remove branchName as route params * Update repositoryData import * Toggle commit-message component in workspace view * Query repositoryName on enter repository route * Change Git module to Clone in clone.js * Remove console statement * Format the code * Update openCmdTerminal() method * Initialize repository (nodegit) (#3592) * Use nodegit and database instead of simple-git for initialize repository feature * Disable git features for non-initialized repositories * Add initialize repository feature from homepage This commit includes an anti-pattern because of mutating this.isGit prop inside component but this can't be avoided without making some major changes. * Settings to auto initialize non-git repository (#3596) * Get & set settings to localStorage Using if/else statement in beforeCreate lifecycle hook insted of using in vuex store mutation * Add AutoInit settings to experimental page * typo: initialize spellings * Dispatch update to settings store (in single line) * fix: autoInit undefined value in settings store #3596 (comment) * Remove console.log statement in setSettings * Fix PR #3598 : Auto init non-git repository (part 2) (#3599) * auto initialize non-git repository * Update repositoryItem.vue after `npm run lint:fix` * Do not initialize new repository on create * Fix blocking error on new repository creation when folder does not exist Co-authored-by: Yashu Mittal <mittalyashu77@gmail.com> * addRepositoryToDatabase based closing modal Incase error event a message can be shown inside the modal. Reference: #3599 (comment) * update isGit value in repository store Creating a updateIsGitStatus mutation to update isGit value inside repository vuex store. Database is updated with the required changes with vuex is unaware of the changes which causes is bug to show repository as `isGit: false`. Reference: #3599 (comment) * Update .electron-vue files replace package-lock.json with yarn.lock * change node engine v14 * ci: run pipeline with node v14 & v16 * ci: change npm to yarn * set node engine v14 or v16 * ci: yarn postinstall deps Co-authored-by: KaKi87 <tiana.lemesle@live.fr>

KaKi87 and others added 7 commits November 13, 2019 15:39

Merge pull request #1 from gitthermal/chore/add-nodegit

980baf8

Chore/add nodegit

auto initialize non-git repository

6faf187

Merge pull request #2 from gitthermal/chore/add-nodegit

035a9a5

Chore/add nodegit

Merge pull request #3 from gitthermal/feat/git-auto-init-repository-2

90e01c6

feat/git-auto-init-repository-2

Update repositoryItem.vue after npm run lint:fix

a0372e2

Do not initialize new repository on create

e78773d

Fix blocking error on new repository creation when folder does not exist

efb8d5d

KaKi87 changed the title ~~Chore/add nodegit~~ Fix PR #3598 : Auto init non-git repository (part 2) Dec 25, 2019

mittalyashu added this to the 0.1.0 milestone Dec 31, 2019

mittalyashu mentioned this pull request Dec 31, 2019

Auto init non-git repository (part 2) #3598

Closed

mittalyashu self-requested a review January 18, 2020 10:54

mittalyashu assigned KaKi87 Jan 18, 2020

mittalyashu requested changes Jan 18, 2020

View reviewed changes

mittalyashu merged commit cfd8cab into gitthermal:chore/add-nodegit Jan 22, 2020

KaKi87 deleted the chore/add-nodegit branch January 22, 2020 14:31

KaKi87 restored the chore/add-nodegit branch January 22, 2020 14:31

mittalyashu added a commit that referenced this pull request Jan 22, 2020

addRepositoryToDatabase based closing modal

6bea6a0

Incase error event a message can be shown inside the modal. Reference: #3599 (comment)

KaKi87 deleted the chore/add-nodegit branch February 3, 2020 18:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix PR #3598 : Auto init non-git repository (part 2)#3599

Fix PR #3598 : Auto init non-git repository (part 2)#3599
mittalyashu merged 7 commits intogitthermal:chore/add-nodegitfrom
KaKi87:chore/add-nodegit

KaKi87 commented Dec 25, 2019

Uh oh!

mittalyashu commented Dec 31, 2019 •

edited

Loading

Uh oh!

KaKi87 commented Dec 31, 2019

Uh oh!

mittalyashu commented Jan 1, 2020

Uh oh!

KaKi87 commented Jan 1, 2020

Uh oh!

mittalyashu commented Jan 5, 2020

Uh oh!

mittalyashu left a comment

Uh oh!

mittalyashu Jan 18, 2020

Uh oh!

mittalyashu Jan 18, 2020 •

edited

Loading

Uh oh!

mittalyashu Jan 18, 2020

Uh oh!

mittalyashu Jan 18, 2020

Uh oh!

KaKi87 commented Jan 18, 2020

Uh oh!

KaKi87 commented Jan 22, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	this.newRepository.isGitRepo = !!repository;
	this.newRepository.isGitRepo = true;

	this.addRepositoryToDatabase(repositoryPath);
	this.addRepositoryToDatabase(repositoryPath);

Uh oh!

Conversation

KaKi87 commented Dec 25, 2019

Uh oh!

mittalyashu commented Dec 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

KaKi87 commented Dec 31, 2019

Uh oh!

mittalyashu commented Jan 1, 2020

Uh oh!

KaKi87 commented Jan 1, 2020

Uh oh!

mittalyashu commented Jan 5, 2020

Uh oh!

mittalyashu left a comment

Choose a reason for hiding this comment

Uh oh!

mittalyashu Jan 18, 2020

Choose a reason for hiding this comment

Uh oh!

mittalyashu Jan 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mittalyashu Jan 18, 2020

Choose a reason for hiding this comment

Uh oh!

mittalyashu Jan 18, 2020

Choose a reason for hiding this comment

Uh oh!

KaKi87 commented Jan 18, 2020

Uh oh!

KaKi87 commented Jan 22, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mittalyashu commented Dec 31, 2019 •

edited

Loading

mittalyashu Jan 18, 2020 •

edited

Loading