lszomoru
commented
2 years ago @DFelten, could you please check the value of the git.repositoryScanMaxDepth setting in the two versions? Thanks!
Closed DFelten closed 2 years ago
lszomoru
commented
2 years ago @DFelten, could you please check the value of the git.repositoryScanMaxDepth setting in the two versions? Thanks!
DFelten
commented
2 years ago Both versions have 1 set as value. But even with -1 the repository did not appear.
As additional info: The main repo contains the second repository as a sub module.
lszomoru
commented
2 years ago @DFelten, would it be possible to share your exact folder structure, setup so that I can reproduce the issue? Thanks!
DFelten
commented
2 years ago This is our current folder structure
framework is the second repository as a git submodule.
lszomoru
commented
2 years ago Could you please share the contents of the .gitmodules file (please feel free to obfuscate strings as needed).
Could you open the "Source Control Repositories" view and see if the repository is listed there? Thank you!
DFelten
commented
2 years ago The .gitmodules is really simple:
[submodule "framework"]
path = framework
url = ../tmx_framework.gitThe repository is not listed there
When typing Git: Merge Branch there is also only one repo.
lszomoru
commented
2 years ago @DFelten, thanks! could you check the following settings across the two versions to make sure they match:
DFelten
commented
2 years ago Of course.
VSCode Insider
VSCode Stable
lszomoru
commented
2 years ago @DFelten, are the two git repositories available somewhere so that I can try to clone them and replicate your setup? If not, would you be able to share how the "framework" repository is located on disk?
Also could you also please implement the following and share the contents of the git output window:
code . --log vscode.git:trace and save the contents of the git output window code-insiders . --log vscode.git:trace and save the contents of the git output window DFelten
commented
2 years ago Sorry, but the repository is private and not possible to share. What do you mean with located on disk? The folder structure is visible in the screenshot.
code . --log vscode.git:trace is producing no output. Nothing happens when writing this to the terminal. The shell extensions are active.
lszomoru
commented
2 years ago That must due to the fact that code and code-insiders is not on the path. Could you open the command palette and invoke the "Shell Command: Install command in PATH" commands. After you invoke those commands from Stable and Insiders you will probably have to restart your terminal. Let me know how it goes.
DFelten
commented
2 years ago The shell command is active like I said in the comment above. I can use code or code-insiders via terminal. For example here I asked for help.
DFelten
commented
2 years ago Issue is still there with the latest insider version of VSCode. Currently I have to use the stable version because of this bug.
Version: 1.73.1
Commit: 6261075646f055b99068d3688932416f2346dd3b
Date: 2022-11-09T02:22:48.959Z (1 wk ago)
Electron: 19.0.17
Chromium: 102.0.5005.167
Node.js: 16.14.2
V8: 10.2.154.15-electron.0
OS: Darwin arm64 22.1.0
Sandboxed: No@DFelten, could you please try the following then:
DFelten
commented
2 years ago Output of both VSCode versions. The Readme file of the main repo and the framework repo is open.
lszomoru
commented
2 years ago @DFelten, thank you very much for sharing the information. The logs confirm the difference in behaviour that you are experiencing. Looking at the Stable logs I see that two repositories are being opened, while Insiders only opens one of them. It's also weird that even though, log level is set to trace I am not seeing any [trace] messages in the logs 🤔
One setting that we have not checked is the git.autoRepositoryDetection.
Could you compare this between the two versions and share the values? Thanks!
DFelten
commented
2 years ago I also noticed that the trace is significantly larger in the stable version.
Regarding your question, autoRepositoryDetection is true for both of them.
lszomoru
commented
2 years ago @DFelten, I think that I have found the issue related to tracing. Will work with the owner to get a fix in and hopefully that will enable us to gather the necessary logs to get to the bottom of this 🤞🏻
DFelten
commented
2 years ago I'm sorry, but a local project setting has changed autoRepositoryDetection to false. Strangely enough, it didn't matter for Stable, here both repositories were displayed. But with the Insider version the framework repository did not appear. Now that I have removed the value from the local setting, the second repository also appears here.
But it would be interesting to know why Stable and Insider behaved differently here.
lszomoru
commented
2 years ago @DFelten, thanks for the update, and I am happy that we tracked down the root cause. Yes, I do want to track down an better understand the difference behaviour between Stable and Insiders. By local project setting, you mean that the setting was set in the .vscode\settings.json file?
DFelten
commented
2 years ago Yes, the settings.json within the .vscode folder of the project.
{
"git.autoRepositoryDetection": false
}@DFelten, thank you! I have looked at the code and there is more to this, as in my case submodules are opened even if I set "git.autoRepositoryDetection": false. When a repository is opened, we have code that detects all the submodules for that repository and attempts to open them. It's not clear to my why this is not working for you. Just now I have added some more tracing that should be in tomorrow's Insiders build that will hopefully get us closer to the solution.
lszomoru
commented
2 years ago @DFelten, new day, new Insiders build. Could you please download the latest Insiders build and implement the following:
"git.autoRepositoryDetection": false/Users/danielfelten/Projekte/Trimexa foldercode-insiders dealdoktor --log vscode.git:tracelszomoru
commented
2 years ago @DFelten, I have a repro locally 🎉. This is a regression introduced as we have updated the code that we are using the parse the .gitmodules file. The parser works fine if the file has an empty line at the end of the file, but if that is missing we are unable to successfully parse the submodules. I will work on a fix that should hopefully be in the Insiders release on Monday.
DFelten
commented
2 years ago You're right, when adding an empty line at the end of the .gitmodulesfile the framework repository appears :) Thanks for your research!
lszomoru
commented
2 years ago No, thank you. Even though it took quite some effort but it helped me tracked down a regression before it made it into the Stable release.
DFelten
commented
2 years ago @lszomoru With the latest VSCode Insider the bug is still there. The framework repository only appears when adding an empty line at the end of .gitmodules.
Version: 1.74.0-insider
Commit: ac084d723b7405591d2110fe374648345ecb8ce6
Date: 2022-11-28T05:21:03.121Z (1 day ago)
Electron: 19.1.6
Chromium: 102.0.5005.167
Node.js: 16.14.2
V8: 10.2.154.15-electron.0
OS: Darwin arm64 22.1.0
Sandboxed: Yes@DFelten, yes, the fix did not make it into Monday's build. It should be in today's build.
Type: Bug
With the latest VSCode build there is a bug with source control on projects with multiple repositories. Only the top level repository is recognized.
The stable VSCode version shows all repositories, but on the insider version only one is visible.
VS Code version: Code - Insiders 1.74.0-insider (a62879bb46c84d0936798cf06debf5f92b04e4b4, 2022-11-14T05:23:01.780Z) OS version: Darwin arm64 22.1.0 Modes: Sandboxed: Yes
Insider VSCode
Stable VSCode
System Info
|Item|Value| |---|---| |CPUs|Apple M1 Max (10 x 24)| |GPU Status|2d_canvas: enabledcanvas_oop_rasterization: disabled_off
direct_rendering_display_compositor: disabled_off_ok
gpu_compositing: enabled
metal: disabled_off
multiple_raster_threads: enabled_on
opengl: enabled_on
rasterization: enabled
raw_draw: disabled_off_ok
skia_renderer: enabled_on
video_decode: enabled
video_encode: enabled
vulkan: disabled_off
webgl: enabled
webgl2: enabled
webgpu: disabled_off| |Load (avg)|6, 6, 6| |Memory (System)|32.00GB (0.18GB free)| |Process Argv|--crash-reporter-id 511166e9-0c5e-4225-a6af-efd2d90c3f8d| |Screen Reader|no| |VM|0%|
Extensions (83)
Extension|Author (truncated)|Version ---|---|--- better-comments|aar|3.0.2 codesnap|adp|1.3.4 vscode-m3u|af4|1.0.0 Bookmarks|ale|13.3.1 project-manager|ale|12.7.0 flutter-snippets|ale|3.0.0 toggle-excluded-files|eam|1.7.0 clipboard-history|Anj|1.0.7 melos-code|bla|0.6.0 vscode-intelephense-client|bme|1.8.2 ccs-flutter-color|cir|1.0.2 gitignore|cod|0.9.0 php-namespace-resolver|ctf|0.0.9 vscode-mysql-client2|cwe|5.9.1 vscode-mac-color-picker|dae|1.1.0 dart-code|Dar|3.53.20221107 flutter|Dar|3.52.0 git-diff-and-merge-tool|dav|1.0.5 vscode-markdownlint|Dav|0.48.1 vscode-new-file|dku|4.0.2 githistory|don|0.6.19 gitlens|eam|13.0.4 bloc|Fel|6.6.2 mason|Fel|0.1.6 flutter-coverage|flu|0.0.4 copilot|Git|1.58.7236 vscode-pull-request-github|Git|0.54.0 gitlab-workflow|Git|3.56.0 todo-tree|Gru|0.0.220 terraform|has|2.24.3 json-to-dart|hir|3.5.8 rest-client|hum|0.25.1 monkey-patch|ioc|0.1.23 pubspec-assist|jer|2.3.2 shortcut-menu-bar|jer|3.0.4 intellij-idea-keybindings|k--|1.5.4 indent-to-bracket|LAK|1.2.2 flutter-intl|loc|1.18.2 syntax-project-pbxproj|mar|0.1.3 flutter-snippets|Mar|1.0.5 Kotlin|mat|1.7.1 rainbow-csv|mec|3.3.0 git-graph|mhu|1.30.0 dart-barrel-file-generator|miq|4.1.0 diff-merge|mos|0.7.0 vscode-docker|ms-|1.22.2 vscode-language-pack-de|MS-|1.74.11100236 isort|ms-|2022.6.0 python|ms-|2022.18.2 vscode-pylance|ms-|2022.11.20 jupyter|ms-|2022.11.1003201029 jupyter-keymap|ms-|1.0.0 jupyter-renderers|ms-|1.0.12 vscode-jupyter-cell-tags|ms-|0.1.6 vscode-jupyter-slideshow|ms-|0.1.5 remote-containers|ms-|0.263.0 live-server|ms-|0.4.3 vsliveshare-pack|ms-|0.4.0 vscode-flutter-freezed-helper|mth|0.1.0 sqltools|mtx|0.26.0 sqltools-driver-mysql|mtx|0.4.1 awesome-flutter-snippets|Nas|4.0.1 vscode-yaml-sort|Pas|6.0.0 vscode-versionlens|pfl|1.0.10 material-icon-theme|PKi|4.22.0 remove-comments|pli|1.2.2 vscode-thunder-client|ran|1.20.1 vscode-yaml|red|1.10.1 vscode-sort-json|ric|1.20.0 flutter-riverpod-snippets|rob|1.2.1 vscode-coverage-gutters|rya|2.10.2 lcov-lang|Ser|1.0.1 reveal|smu|1.2.7 swift-lang|ssw|0.9.0 freezed-model-gen|Sus|1.0.1 better-search|tra|0.0.6 errorlens|use|3.6.0 vscode-lldb|vad|1.8.1 vscode-todo-highlight|way|1.0.5 php-debug|xde|1.29.0 vscode-surround|yat|1.5.0 markdown-all-in-one|yzh|3.4.3 material-theme|zhu|3.15.6 (3 theme extensions excluded)A/B Experiments
``` vsliv695:30137379 vsins829:30139715 vsliv368cf:30146710 vsreu685:30147344 python383:30185418 vspor879:30202332 vspor708:30202333 vspor363:30204092 vslsvsres303:30308271 pythonvspyl392:30422396 pythontb:30258533 pythonptprofiler:30281269 vshan820:30294714 pythondataviewer:30285072 vscod805:30301674 bridge0708:30335490 bridge0723:30353136 cmake_vspar411:30581797 vsaa593cf:30376535 pythonvs932:30404738 cppdebug:30492333 vsclangdf:30492506 c4g48928:30535728 dsvsc012cf:30540253 pylantcb52:30590116 pyindex848cf:30577859 nodejswelcome1:30587009 gswce1:30602633 34cci188:30599831 pyind779cf:30600160 dbltrim-noruby:30604474 ```