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.

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

IOTIDE 2157: hg forget operation replaced with discard #35

Merged
merged 3 commits into from
Nov 13, 2019

Conversation

federicobozzini
Copy link

@federicobozzini federicobozzini commented Nov 12, 2019

What it does

hg forget operation replaced with discard

How to test

Edit a tracked file. Instead of the forget operation, discard is shown.

Review checklist

Reminder for reviewers

registerResourceAction('1_modification', {
commandId: HG_COMMANDS.DISCARD.id,
when: 'scmProvider == hg && scmResourceGroup == changed'
});

Choose a reason for hiding this comment

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

Surely if we support 'discard' but do not support 'forget' then we should be doing it the same way as Git. I.e. the user should delete the file first (typically in the Navigator). There is no equivalent in Git to 'forget' (in the case where it applies to a committed file), and as files without changes do not show up in the Source Control view, such actions would have to be available in the navigator. I think this change is ok, but I just want to be sure because I know Joe wants things to work the same in Git and Hg where it makes sense to treat them the same.

Copy link
Author

Choose a reason for hiding this comment

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

With this change the forget action is completely removed, so, if I understand correctly what you mean, the interface should be the same you get on Git.

Choose a reason for hiding this comment

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

Yes, I see now the Git implementation deletes the file if it's not in the index, so we are fine.

Copy link

@westbury westbury left a comment

Choose a reason for hiding this comment

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

Discard is doing the same as in Git, and Forget of a committed file is not supported directly in Git anyway, so this all looks good.

@westbury westbury merged commit 7e388a2 into release-0.9.0 Nov 13, 2019
@westbury westbury deleted the 2157-hg-discard branch November 13, 2019 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants