-
Notifications
You must be signed in to change notification settings - Fork 2.7k
[git] update to latest dugite-extra, dugite-no-gpl #11782
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
Conversation
|
We have a unit test failure in @theia/git, that I will address by addding a commit: |
b743c29 to
d5a7d02
Compare
|
cc: @thegecko : This is the PR that introduces the uplifted |
|
cc @arekzaluski @mcgordonite could you check this please? |
This commit updates @theia/git to consume the latest `dugite-extra`, which in turn uses the latest, recently uplifted `dugite-no-gpl`. Signed-off-by: Marc Dumais <[email protected]>
Upstream dugite has changed its GitError enum [1], which became part of `dugite-no-gpl` after its uplift. @theia/git has it own GitError enum [2], that I believe needs to be aligned with `dugite's`. This commit atttempts to align our version of that enum. After this update, the @theia/git unit tests now pass. [1] https://github.com/theia-ide/dugite/blob/main/lib/errors.ts#L2-L63 starting at index 16 a new item was inserted, offsetting from that point. New entries were also added towards the end, offsetting the GitHub errors. finally new entries were added after the GitHub section. [2] https://github.com/eclipse-theia/theia/blob/86fe42854196b1c3cea90b95840acae3e0f00061/packages/git/src/common/git-model.ts#L421-L467 Signed-off-by: Marc Dumais <[email protected]>
d5a7d02 to
d3e4c01
Compare
|
@vince-fugnitto I have rebased this PR on the latest master - thanks for volunteering to review it! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
I confirmed the following:
- git decorations work as expected (added, modified, deleted)
-
stageworks as expected -
stage allworks as expected -
unstageworks as expected -
unstage allworks as expected -
discardworks as expected -
discard allworks as expected - toggling
treevslistworks as expected - correct git status in the statubar
-
git diffworks as expected - switching repository in a multi-root workspace works as expected
- confirmed creating a commit, sign-off and pushing works as expected
What it does
This PR updates
@theia/gitto consume the latestdugite-extra, which in turn uses the latest, recently uplifteddugite-no-gpl. The later is a fork of upstreamdugite(minus GPL-licensed git binaries added at install time), that had not been updated in nearly 3 years.Update: investigating a
@theia/gitunit test failure (see below), I noticed we needed to update@theia/git->git-model->GitError enumto match dugite-no-gpl, that had evolved since the last uplift. See commit message for more details.How to test
Make sure the unit tests pass. Some manual testing of theia git extension would probably be a good idea to make sure nothing was broken.
Review checklist
Reminder for reviewers