Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #618: Add new subcommand git machete list childless #632

Merged
merged 6 commits into from
Aug 17, 2022
Merged

Issue #618: Add new subcommand git machete list childless #632

merged 6 commits into from
Aug 17, 2022

Conversation

amalota
Copy link
Contributor

@amalota amalota commented Aug 16, 2022

No description provided.

@amalota amalota self-assigned this Aug 16, 2022
@amalota amalota changed the title init Issue #618: Add new subcommand git machete list childless Aug 16, 2022
@amalota amalota added the feature New feature or request label Aug 16, 2022
@amalota amalota added this to the v3.12.0 milestone Aug 16, 2022
@amalota amalota linked an issue Aug 16, 2022 that may be closed by this pull request
Implement git machete list childless #618
Closed
@PawelLipski PawelLipski self-requested a review August 16, 2022 12:24
PawelLipski
PawelLipski reviewed Aug 16, 2022
View reviewed changes
git_machete/docs.py Outdated Show resolved Hide resolved
PawelLipski
PawelLipski reviewed Aug 16, 2022
View reviewed changes
git_machete/client.py Outdated Show resolved Hide resolved
PawelLipski
PawelLipski reviewed Aug 16, 2022
View reviewed changes
git_machete/client.py Outdated Show resolved Hide resolved
PawelLipski
PawelLipski reviewed Aug 16, 2022
View reviewed changes
tests/mockers.py Outdated Show resolved Hide resolved
PawelLipski
PawelLipski reviewed Aug 16, 2022
View reviewed changes
tests/test_list.py Outdated
.new_branch("feature_1")
.commit("feature_1 commit.")
)
launch_command("discover", "-y")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm maybe better just fill up .git/machete file explicitly? It'll make it more clear how the branch layout is supposed to look

Copy link
Contributor Author

@amalota amalota Aug 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, i can just add the expected layout in the comment below, @PawelLipski wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

like:

        # content of the machete definition file:
        """
        master
        develop
            feature_0
                feature_0_0
                    feature_0_0_0
                feature_0_1
            feature_1
        """

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be... but it might get outdated with the changes to the test. TBH I'd just overwrite machete file explicitly, no need to kinda-test discover in an otherwise non-discover-related test

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PawelLipski I tried overwriting def file but i still had to leave the creation of the branches and the commits so in the end it looked less clear plus it could get outdated as well, i don't see why it would be better

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, my bad, it would not get updated as the tests will probably fail, will try again

PawelLipski
PawelLipski reviewed Aug 16, 2022
View reviewed changes
tests/test_list.py Outdated Show resolved Hide resolved
@amalota amalota force-pushed the feature/618-add-new-subcommand-list-childless branch from 00bc711 to f407ddf Compare August 16, 2022 14:55
@codecov-commenter
Copy link

codecov-commenter commented Aug 16, 2022 •
edited
Loading

Codecov Report

Merging #632 (5274f31) into develop (b4985ab) will increase coverage by 1.62%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop     #632      +/-   ##
===========================================
+ Coverage    67.91%   69.54%   +1.62%     
===========================================
  Files           10       10              
  Lines         2927     2932       +5     
  Branches       707      709       +2     
===========================================
+ Hits          1988     2039      +51     
+ Misses         678      623      -55     
- Partials       261      270       +9
Impacted Files Coverage Δ
git_machete/docs.py 100.00% <ø> (ø)
git_machete/cli.py 75.48% <100.00%> (+5.28%) ⬆️
git_machete/client.py 64.96% <100.00%> (+0.89%) ⬆️
git_machete/git_operations.py 73.80% <0.00%> (+1.69%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@amalota amalota force-pushed the feature/618-add-new-subcommand-list-childless branch from 4125a22 to 4f592a1 Compare August 17, 2022 09:58
@amalota amalota force-pushed the feature/618-add-new-subcommand-list-childless branch from 4f592a1 to 5274f31 Compare August 17, 2022 10:01
PawelLipski
PawelLipski approved these changes Aug 17, 2022
View reviewed changes
Copy link
Collaborator

@PawelLipski PawelLipski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ship it then!

@amalota amalota merged commit 3d5a411 into develop Aug 17, 2022
@amalota amalota deleted the feature/618-add-new-subcommand-list-childless branch August 17, 2022 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PawelLipski PawelLipski PawelLipski approved these changes

Assignees

@amalota amalota

Labels
externally requested feature New feature or request
Projects
None yet
Milestone
v3.12.0
Development

Successfully merging this pull request may close these issues.

Implement git machete list childless
3 participants
@amalota @codecov-commenter @PawelLipski