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

Keep original author on cherry picks #194

Closed
j4yk opened this issue May 20, 2018 · 0 comments
Closed

Keep original author on cherry picks #194

j4yk opened this issue May 20, 2018 · 0 comments
Assignees
@j4yk
Labels
optional Squit Squot
Milestone
release 0.8.0

Comments

@j4yk
Copy link
Collaborator

j4yk commented May 20, 2018

Cherry pick commits currently bear the name of the committer as author and there is no sign of the author of the cherry-picked commit (except for the textual reference to the cherry-picked commit SHA). Instead, the author of the cherry-picked commit should be kept on the cherry pick commit.

Support for this among backend VCSs may vary.
@j4yk j4yk added the help wanted Want pull requests because it is unlikely this will be worked on by the maintainers soon. label Dec 8, 2019
@j4yk j4yk self-assigned this Jan 4, 2020
@j4yk j4yk removed the help wanted Want pull requests because it is unlikely this will be worked on by the maintainers soon. label Jan 4, 2020
j4yk added a commit that referenced this issue Jan 6, 2020
@j4yk
New cherry pick implementation with working copy operations
cdc4c6b 
Extract operations such as merging and cherry picking out of
SquotWorkingCopy. Saving shall also be extracted but it is not
done yet (the cherry pick operation still uses the old save methods
on SquotWorkingCopy instead of the operation, which is unfinished).

The goal is to make such operations more easily extendable. Adding
more and more arguments to existing methods is not an option.
For example, cherry picking should preserve the original author
(ref #194), but this needs another input variable for the save operation
in addition to the patch and the message.

Abandon block callbacks and use asynchronous messaging with Promise
instead. This naturally solves the problem that modal dialogs are defunct
when their UI process is terminated (which unwinds the stack with the
ongoing operation).

Since the save operation is not ready yet, the SquotChangedArtifactsChooser
has been retrofit with a Promise interface. It provides a hack
to recapture the modal invocation in the new UI thread if the
stack is unwound. There are no test cases for this hack.
The view of the chooser is made an instance variable, because
it does not make sense to have multiple views for the tool,
and it is needed to run the modal loop all but the first time.

SquitBrowser functions as service requestor for the cherry pick operation.
It will request on behalf of the operation whether the pick should be
reverted if the save is cancelled.

SquotToggles provides feature flags. In case the new cherry pick
implementation renders cherry picking unusable somehow, the old
behavior can be restored through it.
@j4yk j4yk closed this as completed in a0b9d2a Feb 1, 2020
@j4yk j4yk added this to the release 0.8.0 milestone Feb 1, 2020
@j4yk j4yk mentioned this issue Aug 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@j4yk j4yk

Labels
optional Squit Squot
Projects
None yet
Milestone
release 0.8.0
Development

No branches or pull requests
1 participant
@j4yk