Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-02 23:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,077 Commits 3,089 Branches 347 Tags
2b3fed13e16ca13db3a8504866b215d7098b3de5
Commit Graph

1340 Commits

Author SHA1 Message Date
Eric Amodio
5cb987119a Fixes #90229 2020-02-10 14:52:22 -05:00
Matt Bierner
b46d35c25c Don't import from node in extensions for URL and TextEncoder 
Fixes #90162

Follow up on b1c5e2f19b
 2020-02-07 15:51:13 -08:00
Ian MacFarlane
282732392f Clarify language when creating new git branch 
When using the git extension, the intent is clear when clicking on "+ Create new branch..." and immediately being prompted "Please provide a branch name". But, when clicking on "+ Create a new branch from..." the intent is ambiguous, since the statement "Please provide a branch name" could refer to the branch from which you wish to base the new branch on or the name of the new branch, the latter being what actually happens.

By specifying "Please provide a *new* branch name...", the intent is clear: the prompt is asking for the name you wish to call the new branch.
 2020-02-06 13:04:31 -05:00
Eric Amodio
eaf632c42a Adds uncommitted changes to timeline 2020-02-06 00:04:54 -05:00
Eric Amodio
9cd22d0dc1 Updates list of readonly git commands 2020-02-06 00:02:00 -05:00
Eric Amodio
4cc5b776dc Overhauls timeline display to stream in results 
Implements many API review changes
Fixes #89558
 2020-02-05 18:16:37 -05:00
Joao Moreno
dde577b23e activate git before smoke tests 2020-02-05 15:03:05 +01:00
Joao Moreno
7ed9930136 💄 2020-02-05 11:42:33 +01:00
Joao Moreno
ba25c52127 more git smoke test fixes 2020-02-05 10:57:30 +01:00
Joao Moreno
06dbb1938f make sure git is activated before integration tests run 2020-02-05 10:24:47 +01:00
Joao Moreno
d2f9126da3 git tests: windows is pain 2020-02-04 20:54:46 +01:00
Joao Moreno
5f239c7414 Merge branch 'master' of github.com:microsoft/vscode 2020-02-04 20:26:24 +01:00
Joao Moreno
54007fa545 fix git smoketests 2020-02-04 20:26:12 +01:00
Matt Bierner
b1c5e2f19b Don't include dom typings in extensions (#89942) 
**Problem**
All of our extensions currently are built using the dom typings. This can lead to runtime errors if you mistakenly use `window` or similar

**Fix**
Exclude the dom typings from compile. Then explicitly import the node types for `URL` and `TextEncoder`
 2020-02-04 11:08:22 -08:00
Joao Moreno
16c7551f36 move git smoke tests to integration tests 2020-02-04 17:06:49 +01:00
Joao Moreno
19de7a566c add proper git dev dependencies 2020-02-04 13:04:44 +01:00
Joao Moreno
a2defb0625 fix build 2020-02-04 12:49:59 +01:00
Joao Moreno
1dd16ab728 setup git integration tests 2020-02-04 12:35:28 +01:00
Joao Moreno
c606dd95e1 fix git tests 2020-02-04 12:35:28 +01:00
Joao Moreno
830992d818 fixes #89373 2020-01-30 17:12:15 +01:00
Joao Moreno
a8231df2ff fixes #88024 2020-01-29 12:39:05 +01:00
Eric Amodio
5c92e3af68 Fixes open diff command (backwards) 2020-01-27 15:28:33 -05: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
2dc90b8140 Adds index (staged changes) to timeline 2020-01-27 15:28:33 -05:00
Eric Amodio
d7b5fe4cc7 Adds refresh for when timeline changes 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
Miguel Solorio
666fcc0d62 Fix #88418, update number color for color contrast 2020-01-21 10:23:18 -08:00
Joao Moreno
afe47568c1 git: expose getRepository 2020-01-21 15:49:44 +01:00
Joao Moreno
7a05051001 Merge commit 'refs/pull/86919/head' of github.com:microsoft/vscode into pr/86919 2020-01-15 11:05:43 +01:00
Joao Moreno
420fa18924 💄 2020-01-13 15:54:10 +01:00
João Moreno
99d2801fa5 Merge branch 'master' into fix-gitfs-stat 2020-01-13 15:31:00 +01:00
sharkykh
fc824b9da6 Restore "current git branch name when renaming" 2020-01-06 17:08:16 +02:00
Johannes Rieken
84013e2ef0 fix double quote issues 2020-01-02 20:31:00 +01:00
Rob Lourens
6edd69eaf5 Fix #87343 2019-12-30 11:13:04 -08:00
Matt Bierner
fb2eca62c2 Show empty image instead of error in git diff view for newly staged images 
Fixes #86389
Fixes #86776

Uses `fs.stat` to check if we are showing an untracked image in the git diff view.

Also required fixing `stat` for `gitfs` so that it can try to return the proper sizes for objects
 2019-12-11 15:41:01 -08:00
Joao Moreno
c3c57ae3a0 fixes #86534 2019-12-09 19:17:41 +01:00
Joao Moreno
f203361631 Merge commit 'refs/pull/83466/head' of github.com:microsoft/vscode into pr/83466 2019-11-29 15:11:12 +01:00
Joao Moreno
413a17865c git: use getCommit instead of log 2019-11-29 12:31:19 +01:00
Joao Moreno
ba79d4a0ee Merge commit 'refs/pull/82995/head' of github.com:microsoft/vscode into pr/82995 2019-11-29 12:06:41 +01:00
Joao Moreno
100eead87e fixes #85158 2019-11-28 13:41:55 +01:00
João Moreno
f8b2bb8403 Merge pull request #85459 from vially/git-clone-dest-path 
Add parent path to git clone command
 2019-11-28 13:34:44 +01:00
Joao Moreno
f46ae8ff0d fix build 2019-11-26 15:23:27 +01:00
Joao Moreno
e518f536de fixes #85569 2019-11-26 15:07:06 +01:00
Valentin Hăloiu
1ae9ff4cb1 Add parent path to git clone command 2019-11-23 15:38:47 +01:00
Christof Marti
599c076d91 Fix path 2019-11-22 07:51:52 +01:00
Joao Moreno
f4f0062168 git input box shouldn't handle comments 
related to #84201
 2019-11-21 16:41:35 +01:00
Joao Moreno
3b0571d8c2 cleanup denodeify from git 2019-11-21 16:41:35 +01:00