Commit graph

432 commits

Author SHA1 Message Date
Eric Amodio e62c4302b0 Removes day.js dependency; uses Intl instead 2020-03-26 00:10:41 -04:00
Eric Amodio a096bae36c Switches to use realpath.native instead of wmic 2020-03-25 16:34:52 -04:00
Miguel Solorio 6b745dace7 Use codicons in scm 2020-03-05 11:24:32 -08:00
jeanp413 b0a50321f7 Fixes #91871 2020-03-01 22:16:17 -05:00
Joao Moreno 04c9b01aff
fixes #91466 2020-02-27 09:24:38 +01:00
Joao Moreno d43bb97bb0
git: contribute Clone to explorer 2020-02-19 12:23:02 +01:00
Joao Moreno e7ebb137b7
git: easy case for git init 2020-02-19 11:59:27 +01:00
Joao Moreno acb9817a8d
too many conditions 2020-02-18 16:37:52 +01:00
Joao Moreno 913c256bb3
fixes #90705 2020-02-18 16:36:10 +01:00
Joao Moreno 2d125bc3cf
remove git init action from top of scm 2020-02-17 12:24:01 +01:00
Joao Moreno cce81b98b9
Merge branch 'joao/empty-views-api' 2020-02-17 12:05:37 +01:00
Joao Moreno 25b36c1c37
rename empty view contents to view welcome 2020-02-17 11:25:17 +01:00
Matt Bierner 6ec6f9e3f4 Fix git integration tests
Move back to using normal vscode dependency for now . We will look into moving off it later
2020-02-15 13:13:22 -08:00
Eric Amodio 5c017be321 Fixes broken test with git extension 2020-02-14 18:55:11 -05:00
Eric Amodio 9ae0fd36c9 Enhances timeline - commands, timestamp, etc
Adds contributable commands to timeline items
Adds right-aligned timestamp to timeline items
Adds Open Changes to Git timeline items
Adds Copy Commit ID to Git timeline items
Adds Copy Commit Message to Git timeline items
2020-02-14 15:22:45 -05:00
Joao Moreno eab81b4a31
git missing docs 2020-02-13 16:53:08 +01:00
Joao Moreno d946716fe2
improve git empty view docs 2020-02-13 16:13:10 +01:00
Joao Moreno 3e8bb6cfd4
git: more empty view documentation 2020-02-13 16:03:18 +01:00
Joao Moreno 52d3df6bf2
empty view: placeholder when 2020-02-13 15:32:45 +01:00
Joao Moreno dde577b23e
activate git before smoke tests 2020-02-05 15:03:05 +01:00
Joao Moreno 06dbb1938f
make sure git is activated before integration tests run 2020-02-05 10:24:47 +01:00
Joao Moreno 19de7a566c
add proper git dev dependencies 2020-02-04 13:04:44 +01:00
Joao Moreno 1dd16ab728
setup git integration tests 2020-02-04 12:35:28 +01:00
Eric Amodio b861a1143d Removes open diff command from palette 2020-01-27 15:28:33 -05:00
Eric Amodio 44edf3c197 Polishes the timeline UI/UX
Cleans up API and removes some unused features (e.g. paging)
Adds date formatting
Adds loading progress and message
Removes lots of console.logs 😁
Adds titles to diffs
2020-01-27 15:28:33 -05:00
Eric Amodio 87c2332fed Adds timeline diff on click and icon support 2020-01-27 15:28:33 -05:00
Joao Moreno 548baadc5f
git: have own log level
related to #85992
2020-01-27 14:40:24 +01:00
Joao Moreno a398adac13
revert git uri changes
fixes #88775
2020-01-22 15:29:13 +01:00
Rob Lourens 6edd69eaf5 Fix #87343 2019-12-30 11:13:04 -08:00
Joao Moreno f4f0062168 git input box shouldn't handle comments
related to #84201
2019-11-21 16:41:35 +01:00
Joao Moreno e055299e77
fix git commands 2019-11-20 09:37:02 +01:00
Benjamin Pasero b8bb1770a5 🆙 jschardet (for #83421) 2019-11-11 07:52:18 +01:00
Joao Moreno fd091abb85
fixes #84274 2019-11-08 15:55:30 +01:00
Joao Moreno 467079f43d remove double action 2019-11-07 13:56:55 +01:00
Joao Moreno ad6011cb7a rename git.untrackedChanges: default to mixed 2019-10-28 10:35:56 +01:00
Benjamin Pasero ca22de4b17 debt - bump node.d.ts dependency in extensions to 12.x (part of #82514) 2019-10-28 08:11:47 +01:00
Joao Moreno 7da96f94c1
cleanup setting name and values 2019-10-25 16:11:36 +02:00
Joao Moreno 82abb9e56d
differentiate between tracked & untracked in staging 2019-10-25 16:01:52 +02:00
Joao Moreno 003177ea90
git.stageAllUntracked, git.cleanAllUntracked 2019-10-25 15:49:38 +02:00
Joao Moreno a8b09d4711
fixed scope 2019-10-25 15:14:59 +02:00
Joao Moreno 1a071b1f79
Merge commit 'refs/pull/80083/head' of github.com:microsoft/vscode into pr/80083 2019-10-25 12:15:59 +02:00
Joao Moreno b716ca6ae6
fix typo 2019-10-25 11:38:55 +02:00
Joao Moreno 980fb4b0ff
Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342 2019-10-25 11:32:15 +02:00
Joao Moreno 93f1e0287b
git: remove bad menu 2019-10-25 09:54:20 +02:00
Joao Moreno f402575486 cleanup git delete tag command 2019-10-24 15:27:57 +02:00
Joao Moreno 23a4df3672 Merge commit 'refs/pull/74345/head' of github.com:microsoft/vscode into pr/74345 2019-10-24 15:13:29 +02:00
Joao Moreno 9e5c2aca23 fixes #67814 2019-10-08 16:57:22 +02:00
Phil Marshall 963120ba87 add git.showCommitInput config option (#79074) 2019-10-04 16:35:31 -05:00
Joao Moreno 14d47d35a9 fixes #79239 2019-09-23 12:00:36 +02:00
Joao Moreno bcd7bcedff wip: scm folder menus 2019-09-18 09:49:35 +02:00
jakob 63f6496094 config option to separate or hide untracked files 2019-08-29 17:09:47 -04:00
Xhulio Hasani 32d59ba806 Added quickpick option and display of tag annotation on menu 2019-08-20 16:05:46 -04:00
Joao Moreno 22a3f3ec83 💄 2019-08-13 09:54:20 +02:00
Joao Moreno 2c878484c8 Merge commit 'refs/pull/78695/head' of github.com:microsoft/vscode into pr/78695 2019-08-13 09:46:54 +02:00
Xhulio Hasani 98ed0fc2e8 Merge branch 'master' of https://github.com/microsoft/vscode 2019-08-11 19:50:41 -04:00
skprabhanjan 1556800102 Fix fix-64077 With a setting 2019-08-08 16:14:23 +05:30
Joao Moreno 6af97c8756 💄 2019-08-08 12:02:55 +02:00
Joao Moreno 273cca4ac8 Merge commit 'refs/pull/70536/head' of github.com:microsoft/vscode into pr/70536 2019-08-08 11:57:25 +02:00
Joao Moreno 181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
Joao Moreno 3dc34be7ae Merge commit 'refs/pull/70539/head' of github.com:microsoft/vscode into pr/70539 2019-08-08 11:34:18 +02:00
Joao Moreno fa5c79386c git: promptToSaveFilesBeforeCommit should have more options
related to #66296
2019-08-08 11:30:25 +02:00
Joao Moreno 54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00
João Moreno a3984f7371
Merge pull request #63743 from mIkhail-zaretsky/disable-smart-commit
'suggestSmartCommit' configuration setting was introduced
2019-08-05 17:29:53 +02:00
Pine Wu d44f9dae34 Use array of string for applicable builtin settings 2019-07-17 15:07:31 -07:00
Drew Cross 528f5805e7 Updating naming scheme to match other commands 2019-07-10 20:18:15 -07:00
Drew Cross d5a83f6d38 Fixing typo 2019-07-05 10:32:29 -07:00
Drew Cross a047914487 Adding git stash drop for issue 76195 2019-06-29 07:19:20 -07:00
Xhulio Hasani 8173fb9a92 Merge branch 'master' of https://github.com/microsoft/vscode 2019-06-28 23:06:25 -04:00
Miguel Solorio 005a5e4fae Update SCM icons 2019-06-18 13:17:44 -07:00
Joao Moreno 4a3c056e9a use --follow-tags instead of --tags when pushing
fixes #70081
fixes #75240
2019-06-12 11:06:54 +02:00
Aurélien Pupier 7a5bca9faf Add License field to package.jsons #68423 (#68771)
it should avoid to have "warning XXX: No license field" during yarn
build

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
2019-06-06 11:44:50 +02:00
Joao Moreno afa4faa587 fix git extension tests 2019-06-05 10:22:48 +02:00
Benjamin Pasero d78a75973c
update @types/node (#74881) 2019-06-05 10:20:01 +02:00
Xhulio Hasani c125f8ed7b added deleteTag 2019-05-26 01:20:24 -04:00
Hao Hu 2058f27615 Add git.pullTags setting 2019-05-23 11:28:28 +02:00
Sandeep Somavarapu 1fd2993b54 Fix #72185 2019-04-12 07:44:56 +02:00
Joao Moreno f50b46c334 fixes #70985 2019-03-25 11:56:30 +01:00
Joao Moreno 6824561046 fixes #70812 2019-03-20 09:34:26 +01:00
ipmsteven 4935612fe6 introduce onlyTrackedFilesCanBeAutoStaged feature flag 2019-03-14 23:23:11 -07:00
Josh Leeb-du Toit 05ed3df9b8 Add option to hide git sync button in status bar
This PR adds the option `git.statusBarSync.enabled` which when set to `false`
will hide the `SyncStatusBar` icon that is, by default, visible in the status
bar.
2019-03-15 17:11:32 +11:00
Joao Moreno 9fb1a067b6 Merge branch 'master', commit 'refs/pull/60640/head' of github.com:Microsoft/vscode into pr/60640 2019-03-08 10:07:10 +01:00
Joao Moreno 94f7ae74c5 fixes #69529 2019-03-05 11:15:49 +01:00
Joao Moreno 5c049a93ae fixes #68894 2019-02-19 10:58:59 +01:00
Benjamin Pasero e2d1fd06d1 debt - update extensions node dependency to 10.x 2019-02-07 08:49:36 +01:00
SteVen Batten ccdd2997a6
update AI module (#66370)
fixes #64849
2019-01-10 17:43:25 -08:00
Joao Moreno c4a1b80e48 fix git settings scope 2019-01-07 09:58:34 +01:00
Joao Moreno 2f82209adf 💄 cleanup git input validation rules
#60407
2019-01-04 17:03:11 +01:00
Joao Moreno e6878ce54f Merge commit 'refs/pull/60407/head' of github.com:Microsoft/vscode into pr/60407 2019-01-04 16:51:22 +01:00
Joao Moreno a8aa85192a Merge branch 'master', commit 'refs/pull/60387/head' of github.com:Microsoft/vscode into pr/60387 2019-01-04 16:40:21 +01:00
Joao Moreno 3d928bbb27 💄 auto fetch period 2019-01-04 16:38:12 +01:00
Joao Moreno 32d22dbace Merge commit 'refs/pull/59988/head' of github.com:Microsoft/vscode into pr/59988 2019-01-04 16:30:25 +01:00
Joao Moreno 133e999097 💄 2019-01-04 15:16:45 +01:00
Joao Moreno cf107f3c3d Merge commit 'refs/pull/59078/head' of github.com:Microsoft/vscode into pr/59078 2019-01-04 15:02:46 +01:00
Joao Moreno 9b88d30734 Merge commit 'refs/pull/59849/head' of github.com:Microsoft/vscode into pr/59849 2019-01-04 14:34:28 +01:00
Joao Moreno 349b0d454e fix git.openDiffOnClick scope 2018-12-20 10:17:26 +01:00
m.zaretski fe6864f649 'suggestSmartCommit' configuration setting was introduced 2018-11-25 17:32:09 +03:00
Joao Moreno 6052fcf07f Merge commit 'refs/pull/59735/head' of github.com:Microsoft/vscode into pr/59735 2018-11-20 09:43:16 +01:00
Joao Moreno e5406b523e introduce git.openDiffOnClick
fixes #63005
2018-11-19 11:54:51 +01:00
Joao Moreno eb6025ec9b git.postCommitCommand
fixes #62058
2018-11-19 11:54:51 +01:00
Joao Moreno d4b84e645f fix #62344 2018-11-12 11:18:58 +01:00