Use subrepo to link to PyDev.Debugger instead of copying it#1714
Merged
rchiodo merged 8 commits intomicrosoft:mainfrom Oct 29, 2024
Merged
Use subrepo to link to PyDev.Debugger instead of copying it#1714rchiodo merged 8 commits intomicrosoft:mainfrom
subrepo to link to PyDev.Debugger instead of copying it#1714rchiodo merged 8 commits intomicrosoft:mainfrom
Conversation
…bugpy/_vendored/pydevd subrepo: subdir: "src/debugpy/_vendored/pydevd" merged: "7d6e6e68" upstream: origin: "https://github.com/fabioz/PyDev.Debugger.git" branch: "main" commit: "7d6e6e68" git-subrepo: version: "0.4.9" origin: "???" commit: "???"
…src/debugpy/_vendored/pydevd subrepo: subdir: "src/debugpy/_vendored/pydevd" merged: "cf2e47cb" upstream: origin: "https://github.com/fabioz/PyDev.Debugger.git" branch: "main" commit: "cf2e47cb" git-subrepo: version: "0.4.9" origin: "???" commit: "???"
debonte
approved these changes
Oct 29, 2024
AdamYoblick
reviewed
Oct 29, 2024
| copy run_code_on_dllmain_x86.pdb ..\run_code_on_dllmain_x86.pdb /Y | ||
|
|
||
| cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /out:inject_dll_x86.exe | ||
| cl /EHsc /Zi /O1 /W3 /Qspectre inject_dll.cpp /link /PROFILE /GUARD:CF /CETCOMPAT /out:inject_dll_x86.exe |
Contributor
There was a problem hiding this comment.
Will we have to fix these compiler and linker flags up every time we pull from PyDev.Debugger, or are we trying to push these changes back to him?
Contributor
Author
There was a problem hiding this comment.
I'm going to push this back to him now
Contributor
Author
There was a problem hiding this comment.
I had made these changes there but missed a spot, this is my changes coming back
Contributor
Author
|
Here's the PR into PyDev.Debugger: I made this with just the subrepo command: And then: |
rchiodo
added a commit
to rchiodo/debugpy
that referenced
this pull request
Nov 14, 2024
…oft#1714) * Remove copy of pydevd and add subrepo script * git subrepo clone https://github.com/fabioz/PyDev.Debugger.git src/debugpy/_vendored/pydevd subrepo: subdir: "src/debugpy/_vendored/pydevd" merged: "7d6e6e68" upstream: origin: "https://github.com/fabioz/PyDev.Debugger.git" branch: "main" commit: "7d6e6e68" git-subrepo: version: "0.4.9" origin: "???" commit: "???" * Add binskim settings to match debugpy * git subrepo clone --force https://github.com/fabioz/PyDev.Debugger.git src/debugpy/_vendored/pydevd subrepo: subdir: "src/debugpy/_vendored/pydevd" merged: "cf2e47cb" upstream: origin: "https://github.com/fabioz/PyDev.Debugger.git" branch: "main" commit: "cf2e47cb" git-subrepo: version: "0.4.9" origin: "???" commit: "???" * Remove unnecessary string test by removing the lambda in pydevd_sys_monitoring * Fix linter * Put back the fix in qt_loaders * Put back binskim flag
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This changes debugpy to subrepo PyDev.Debugger instead of just having a copy of it. This should make it easier to push commits between the two repositories.
Subrepo isn't like git submodule though. We are sync'd to a specific commit of PyDev.Debugger. Any changes to PyDev.Debugger have to be pulled into debugpy (and vice versa changes here have to be pushed to PyDev.Debugger).
I also made changes to get the latest commit PyDev.Debugger to work with debugpy. There was a problem with lambdas in pydevd_sys_monitoring messing up entry point breakpoints. The fix I made was to eliminate the lambda usage.