New commands, bug fixes and support for aliases #54

pomek · 2017-08-04T14:55:18Z

Suggested merge commit message (convention)

Feature: Introduced new commands and fixes bugs related to invalid displayed errors. Closes #2. Closes #45. Closes #49. Closes #52.

New commands:
- checkout – changes branches in repositories according to the configuration file (see Introduce mgit checkout #52),
- diff – prints changes from all repositories (see Add status command #2),
- status – prints a table which contains useful information about the status of repositories (see Add status command #2).
Bug fixes:
- known errors should not be logged as crashes (see Known errors should not be logged as crashes #45),
- fixed Unhandled promise error (see Unhandled promise: TypeError: msg.trim is not a function #49).
Added support for aliases (st => status, co => checkout).

Additional information

On the occasion, I simplified the promises flow in the commands.

… will be displayed.

pomek · 2017-08-04T15:00:58Z

So we need to restart the build after some time.

…function.

Reinmar · 2017-08-09T09:25:48Z

README.md

@@ -98,6 +98,12 @@ CLI options:
 --scope                     Restricts the command to packages which names match the given glob pattern.

                            Default: null
+
+--packages-prefix           The common name of the packages. The prefix will be removed from packages' names in order to


Why is this a CLI config option? Do you expect anyone to use it? I don't. If anywhere – this is for mgit.json only.

Removed in d95291a.

Reinmar · 2017-08-09T09:33:56Z

Since you're adding the checkout command, I think that we should also clean up the bootstrap/update mess. It would be good to decide what commands we use and how and when.

pomek · 2017-08-09T09:37:30Z

Could we clean up the mess after merging these changes? I would like to avoid bigger PR than we have now. After merging we will be able to decide how these commands should work and what should do.

Reinmar · 2017-08-09T10:25:29Z

Yes, we can. But if you wanted to add mgit status we should've bootstrap this discussion before. DOn't dive into topics which are not yet clarified because you may be wasting your time.

Reinmar · 2017-08-09T15:02:42Z

README.md

@@ -255,6 +254,62 @@ Example:
 mgit save-hashes
 ```

+### status
+##### Available also `st`


That shouldn't be a heading. Don't use semantical markup for styling reasons.

We can have ### stats (alias: st).

Please also add a screenshot.

Reinmar · 2017-08-09T15:03:12Z

README.md

+In order to save space in your terminal, you can define the `packagesPrefix` option in your configuration file.
+The prefix will be removed from packages' names. Full names of packages aren't needed so we can cat the names.
+
+### diff


Please add a screenshot.

Reinmar · 2017-08-09T15:04:22Z

lib/commands/bootstrap.js

@@ -21,57 +21,55 @@ module.exports = {
 	execute( data ) {
 		const log = require( '../utils/log' )();

-		return new Promise( ( resolve, reject ) => {
-			const destinationPath = path.join( data.options.packages, data.repository.directory );
+		const destinationPath = path.join( data.options.packages, data.repository.directory );


Did you change anything in this file or is it just a code style?

If so – why changing anything?

Changes in bootstrap, savehashes and update will resolve #45 and #49.

Reinmar · 2017-08-09T15:06:21Z

lib/commands/savehashes.js

-			execCommand.execute( getExecData( 'git rev-parse HEAD' ) )
-				.then( execResponse => {
-					const commitHash = execResponse.logs.info[ 0 ];
+		return execCommand.execute( getExecData( 'git rev-parse HEAD' ) )


The same question as about bootstrap.

Reinmar · 2017-08-09T15:07:11Z

lib/commands/update.js

@@ -22,82 +22,77 @@ module.exports = {
 		const bootstrapCommand = require( './bootstrap' );
 		const execCommand = require( './exec' );

-		return new Promise( ( resolve, reject ) => {
-			const destinationPath = path.join( data.options.packages, data.repository.directory );
+		const destinationPath = path.join( data.options.packages, data.repository.directory );


The same – what are these changes?

Reinmar · 2017-08-09T15:18:04Z

I found one issue:

Reinmar · 2017-08-09T15:24:24Z

And the co task could print less info if everything went well. This is hard to parse:

One line per repo would be better. Something like "HEAD is now at f1131bc... Merge pull request #33 from ckeditor/t/32" will be fine.

Reinmar · 2017-08-09T15:27:25Z

~~Another bug – mgit update leaves repos on detached state. State before and after calling mgit update:~~

~~This is a regression.~~

EDIT: My bad. I was on master-revisions.

pomek · 2017-08-09T15:33:27Z

I found one issue:

Ok, mgit should not show staged files as modified also. I'll correct it.

pomek · 2017-08-09T16:13:39Z

And the co task could print less info if everything went well. This is hard to parse:

It is also hard to predict what we want to display:

Maybe should we display the last line of the log instead of all?

Reinmar · 2017-08-09T16:18:10Z

Maybe should we display the last line of the log instead of all?

👍

pomek · 2017-08-09T16:19:07Z

Reinmar · 2017-08-16T08:23:52Z

I've been using these new commands for some time and they are great. No more issues found.

Kamil Piechaczek added 12 commits August 2, 2017 14:53

Added parser for response returned by "git status -sb" command.

5003296

Added support for aliases.

7a77110

Code style fixes.

803c93c

Introduced new command - "status". It is also available as "st".

a963d69

Introduced "mgit diff" command.

76bdddf

Introduced new command - "mgit checkout".

e5fce50

Fixed invalid docs.

82fc657

Simplified the promises flow. All errors during the command execution…

1d34b3d

… will be displayed.

Simplified the code.

5df1a79

Tests for "checkout" command.

f15450d

Tests for "diff" command.

4d143d9

Tests for "status" command.

280912e

pomek requested a review from Reinmar August 4, 2017 14:55

Kamil Piechaczek added 2 commits August 4, 2017 18:18

CI Trigger.

54ae9d7

Changed the way how the prefixes are compared in "gitStatusParser()" …

92f66f6

…function.

Reinmar reviewed Aug 9, 2017

View reviewed changes

Removed "packagesPrefix" option from CLI.

d95291a

Reinmar reviewed Aug 9, 2017

View reviewed changes

Reinmar added the status:review- label Aug 9, 2017

Kamil Piechaczek added 3 commits August 9, 2017 18:03

Improved the README.

5e7d82e

"gitStatusParser()" will not return staged files as modified too.

260452b

Code style: aligned to new version of Linter.

7917873

Improved logs returned by "mgit checkout" command.

93ea184

pomek removed the status:review- label Aug 9, 2017

Added missing dependency.

d6abe89

Reinmar merged commit c66c11a into master Aug 16, 2017

Reinmar deleted the t/2 branch August 16, 2017 08:24

pomek mentioned this pull request Aug 16, 2017

The update command does fetch + checkout + pull which is confusing #10

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New commands, bug fixes and support for aliases #54

New commands, bug fixes and support for aliases #54

pomek commented Aug 4, 2017

pomek commented Aug 4, 2017

Reinmar Aug 9, 2017

pomek Aug 9, 2017

Reinmar commented Aug 9, 2017

pomek commented Aug 9, 2017

Reinmar commented Aug 9, 2017

Reinmar Aug 9, 2017

Reinmar Aug 9, 2017

Reinmar Aug 9, 2017

Reinmar Aug 9, 2017

Reinmar Aug 9, 2017

pomek Aug 9, 2017

Reinmar Aug 9, 2017

Reinmar Aug 9, 2017

Reinmar commented Aug 9, 2017

Reinmar commented Aug 9, 2017

Reinmar commented Aug 9, 2017 •

edited

Loading

pomek commented Aug 9, 2017

pomek commented Aug 9, 2017

Reinmar commented Aug 9, 2017

pomek commented Aug 9, 2017

Reinmar commented Aug 16, 2017

New commands, bug fixes and support for aliases #54

New commands, bug fixes and support for aliases #54

Conversation

pomek commented Aug 4, 2017

Suggested merge commit message (convention)

Additional information

pomek commented Aug 4, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Reinmar commented Aug 9, 2017

pomek commented Aug 9, 2017

Reinmar commented Aug 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Reinmar commented Aug 9, 2017

Reinmar commented Aug 9, 2017

Reinmar commented Aug 9, 2017 • edited Loading

pomek commented Aug 9, 2017

pomek commented Aug 9, 2017

Reinmar commented Aug 9, 2017

pomek commented Aug 9, 2017

Reinmar commented Aug 16, 2017

Reinmar commented Aug 9, 2017 •

edited

Loading