Commit Graph

181 Commits

Author SHA1 Message Date
Ladislau Szomoru
484cd68eff SCM - history view (#216629)
* Hacked up the starting point

* More progress

* More progress

* Simplified algo, basic support for colors

* Add the concept of secondary colors for merge commits

* Further optimizations of the algo

* Bug fixes to clean-up algo

* Add support for curved branches

* Keep track of nodes that are moved so that the second parent for the merge commit is rendered in the correct swimlane

* Account for offset when drawing a base commit

* Algo rework completed

* Revert some of the hacks that were put in place to quickly get going

* Add caching to the history items used in the graph
Remove more hacks that were in place

* Added initial tests

* More work so that incoming/outgoing works along history

* Uncomment more code

* Bug fixes to edge cases

* Experiment with a new rendering for curved branches

* Handle repository with a single commit

* Maintain swimlanes

* Fix condition

* Saving my changes

* More polish and clean-up

* Remove code that is not needed

* Revert change

* Revert more changes

* More fixes

* Rename interface

* One last minor change

* Pull request feedback

* More refactoring

* More pull request feedback

* Fix layering issues
2024-06-19 19:45:06 +02:00
Ladislau Szomoru
a8e00a00dd Git - expose untracked changes group (#216414) 2024-06-18 10:59:53 +02:00
Connor Peet
6629c4e0a9 git: allow querying whether files are gitignore (#212982)
* git: allow querying whether files are gitignore

This exposes `checkIgnore`, which I want to use in copilot to determine
which files I should go into when checking references.

* rename method
2024-05-23 21:28:04 +02:00
Ladislau Szomoru
a7f384badb Git - remove deprecated extension API (#209010) 2024-03-28 05:25:40 -07:00
Ladislau Szomoru
967170aa0a Git - add the capability to filter git log based on the author (#207169) 2024-03-08 16:41:40 +01:00
Ladislau Szomoru
ae7a786d1b Git - do not invoke post commit commands when calling commit through the git extension api (#205364) 2024-02-16 14:32:31 +01:00
Ladislau Szomoru
5be6890cf5 Git - add onCommit event to vscode.git extension API (#202863) 2024-01-19 17:34:44 +01:00
Alex Ross
7109701918 Expose git merge as extension API (#202503)
* Expose git merge as extension API
Part of microsoft/vscode-pull-request-github#200

* Respond to PR feedback
2024-01-15 17:22:43 +01:00
Malix
31f8f0dd17 Remove unused import in extensions/git/src/api/git.d.ts (#200797)
Remove unused import
2023-12-14 09:01:39 +00:00
Ladislau Szomoru
1466cbfcdf SCM - delete scmInputBoxActionButton proposal (#200012) 2023-12-05 10:52:01 +01:00
Ladislau Szomoru
10e672c687 Revert "Git - deprecate registerCommitMessageProvider (#198953)" (#199022)
This reverts commit 93ab1bfe22.
2023-11-24 14:12:45 +01:00
Ladislau Szomoru
93ab1bfe22 Git - deprecate registerCommitMessageProvider (#198953) 2023-11-23 17:42:17 +01:00
Ladislau Szomoru
a776d5fe0a SCM - input box value provider rendering (#198923)
* Initial implementation

* Remove debug messages

* Implementation using a custom ActionViewItem

* Switched to using a custom action along with the custom action view item

* Switch to using arrays

* Refactored code (single provider is working)

* Add ActionRunner to options

* WIP - saving my work

* Refactor things to support one provider

* Add setting to enable/disable input action button

* Add sourceControlId to the proposed API

* Fix issue related to enablement

* Remove code that is not in scope

* Have the old action bar work with the setting

* Remove code that was commented out

* Add extension API changes

* Update extensions/git/src/commitMessageProvider.ts

Co-authored-by: João Moreno <joao.moreno@microsoft.com>

* Fix compilation errors

---------

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
2023-11-23 16:39:53 +01:00
Ladislau Szomoru
e0b70e58b3 SCM - add caching layer to incoming/outgoing tree nodes (#198306)
* Upstream commit + improve onDidChangeCurrentHistoryItemGroup

* Refactor expanding a history item group

* Wire up caching

* Invoking the git.refresh command invalidates the cache

* Clean up cache data structure
2023-11-15 15:09:18 +01:00
Ladislau Szomoru
ed30010d3f Git - better error handling for git merge-base (#198208) 2023-11-14 14:51:17 +01:00
Ladislau Szomoru
e447d54e1e SCM - Add short state badge for history items (#198126)
* Git - Extract parsing of git diff short stat

* Add shortStat badge for commits

* Git - specify diff-merges for merge commits

* Add tests
2023-11-13 16:49:28 +01:00
Tatsunori Uchino
2683aa01ac Add support for --force-if-includes to force push more safely (#187932)
* Add support for `--force-if-includes` to force push

* Change force push failed error message

* Separate force push (no with lease) failed error message

* Switch to `"markdownDescription"`

* Add Git version requirement for config description

* Improve error message when safer force push is rejected

* Eliminate the option's effect if Git is too old

* Minor improvements to community contribution

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2023-10-23 17:47:46 +02:00
Ladislau Szomoru
b8c3c75f5d Git - Update CommitMessageProvider git extension API (#196170)
Update CommitMessageProvider git extension API
2023-10-21 09:15:39 -07:00
Ladislau Szomoru
c05b49710b SCM - Add proposal for inputBox action button (#196121)
* SCM - Add proposal for inputBox action button

* More reliable fix for overlapping
2023-10-21 09:51:24 +02:00
Ladislau Szomoru
8e80e950a4 Git - improve heuristics for determining branch base (#193986)
* Add getBranchBaseFromReflog

* Read/store branch merge base in the git config

* Add getBranchBase() extension api
2023-09-25 15:12:10 +01:00
Ladislau Szomoru
1545aeab06 SCM - Initial implementation of the Sync view (#193440) 2023-09-19 15:58:22 +02:00
Alex Ross
1ac6f50f44 Enable the .. argument for git log (#188500)
* Enable the `..` argument for git log
This will return the commits that the `toRef` has but the `fromRef` does not.

* Use range instead
2023-09-04 14:36:16 +02:00
Ladislau Szomoru
ad395686d2 Git - add support for type changed (#187714)
* Initial implementation

* Add icons
2023-07-12 16:18:38 +02:00
Ladislau Szomoru
e7e97f8ea8 Git - handle --intent-to-add on a renamed resource (#183307) 2023-05-24 13:11:57 +02:00
Joyce Er
9f081fd11a Open branches on vscode.dev from ref picker (#181549) 2023-05-24 11:23:40 +02:00
Ladislau Szomoru
edcad3ab53 GitHub - use GitHub default branch name when publishing to GitHub (#183207) 2023-05-24 11:15:17 +02:00
Ladislau Szomoru
5ea57c3b48 GitHub - leveral repository rules for branch protection (#180416)
* WIP - switching to use repository ruleset information

* Handle includes

* Refactor to add support for exclusion

* Fix exclude condition

* Fix request string

* Add logging

* Update setting description
2023-04-20 16:43:42 +02:00
Ladislau Szomoru
45a44d1786 Git/GitHub - Branch protection refactoring (#179848)
Branch protection refactoring
2023-04-13 10:14:33 +01:00
Ladislau Szomoru
bb7570f4f8 GitHub - branch protection provider (#179789)
* Initial implementation

* Update default setting state
2023-04-12 17:42:51 +02:00
Ladislau Szomoru
a1eb9e2b48 Git - implement branch protection provider (#179752)
* Branch protection using settings is working

* Revert extension api changes

* Refactor code
2023-04-12 08:48:29 +01:00
Ladislau Szomoru
475c59b638 Git - Deprecate the refs property (#172772) 2023-01-30 11:33:37 -08:00
Ladislau Szomoru
827636e106 Git - Add getRefs() extension API (#170903)
* Add `getRefs()` extension API

* Cleanup
2023-01-11 11:21:23 +01:00
Ladislau Szomoru
c180a08350 Git - fix discard changes when the repository does not have an initial commit (#169397) 2022-12-16 14:47:25 +01:00
Ladislau Szomoru
d4a299631a Git - Handle tag conflict during pull operation (#167278)
Handle tag conflict during pull operation
2022-11-25 17:05:22 +00:00
Ladislau Szomoru
e1c7285ab5 Git - Add the ability to fetch a branch before it is checked out (#160181) 2022-09-15 16:04:37 +02:00
Ladislau Szomoru
e97b478d06 Commit dropdown button uses text-overflow (#160834) 2022-09-14 20:40:06 +02:00
Ladislau Szomoru
52223728f8 Git - Add the ability to commit and not execute a post-commit command (#160527)
Add the ability to commit and not execute a post-commit command
2022-09-09 14:58:38 +02:00
Ladislau Szomoru
3cfc74c52e Git - Add setting to remember post commit command (#158449) 2022-08-22 12:34:47 +02:00
Ladislau Szomoru
c7c0acd2ce Git - Commit action button extension api (#154555) 2022-07-12 17:06:16 +02:00
Ladislau Szomoru
367eefd5f1 Git - commit action button (#153031) 2022-06-24 16:07:24 +02:00
Ladislau Szomoru
6f5fc17622 Git - use editor as commit message input (#151491) 2022-06-08 15:45:27 +02:00
Solomon Kinard
3c6fdedd0e Quick spelling update (#150759)
https://github.com/Sertion/vscode-gitblame/pull/123
2022-05-31 21:06:38 +00:00
Ladislau Szomoru
9bfd3c1d72 Revert "A full editor can be used as git commit message editor (#95266)" (#150487)
This reverts commit 97f8e66d74.
2022-05-26 14:06:23 -07:00
Jonas Dellinger
97f8e66d74 A full editor can be used as git commit message editor (#95266)
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2022-05-25 17:16:10 +02:00
Sebastian Bresin
7ed4699079 feat: also expose repository.revert() (#145029) 2022-03-21 13:11:43 +01:00
Johannes Rieken
4a130c40ed enable @typescript-eslint/member-delimiter-style, https://github.com/microsoft/vscode/issues/140391 2022-02-02 14:35:33 +01:00
Ladislau Szomoru
f0f5baffb9 Fix #124066 2021-12-13 15:44:20 +01:00
Christopher M Kline
b0d7083e79 Expose 'tag' and 'deleteTag' in git extension API (#123815) 2021-12-13 14:37:47 +01:00
Ladislau Szomoru
bfad20be9d Extract remote source provider registry into the vscode.git-base extension (#137656) 2021-11-24 20:48:44 +01:00
Rachel Macfarlane
e3829dc247 Add 'prune' option to fetch in git extension API (#117923)
Add 'prune' option to fetch in git extension API
Add overload to fetch to pass options
2021-03-02 15:18:59 -05:00