Commit Graph

2410 Commits

Author SHA1 Message Date
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
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
Jiayue. Zhang
b61b242503 Merge branch 'master' into issue/88294 2020-01-31 15:49:40 +09:00
Ben Curtis
33b5a9ba25 Merge branch 'master' into ignore_sub 2020-01-30 13:16:06 -05:00
Joao Moreno
830992d818 fixes #89373 2020-01-30 17:12:15 +01:00
Jiayue Zhang
51b8bd5064 Fix #88294 Add commitData in commit interface 2020-01-30 01:10:05 +09: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
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
Oliver Larsson
2abdb90472 git.pruneOnFetch setting implemented 2020-01-24 21:20:44 +01:00
Joao Moreno
a398adac13 revert git uri changes
fixes #88775
2020-01-22 15:29:13 +01:00
Joao Moreno
afe47568c1 git: expose getRepository 2020-01-21 15:49:44 +01:00
Fmstrat
d7ed37e864 add ignoreSubmodules option 2020-01-16 09:39:19 -05: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
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
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
Joao Moreno
db5b58c442 isolate askpass 2019-11-21 15:16:49 +01:00
Joao Moreno
1b5afdf5c3 refactor 2019-11-21 15:16:49 +01:00
Joao Moreno
e7e562da3c remove data uri from git 2019-11-21 09:28:23 +01:00
Joao Moreno
f37b9d742c git: isolate ipc env 2019-11-20 16:07:01 +01:00
Joao Moreno
39c14fc431 💄 2019-11-20 15:15:46 +01:00
Joao Moreno
14cc75aa22 git: extract ipc 2019-11-20 15:15:45 +01:00
Joao Moreno
ec8de4eb45 git: better uri parsing error message 2019-11-20 10:53:20 +01:00