Commit Graph

1307 Commits

Author SHA1 Message Date
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
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
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
3bf8e81517 fixes #85205 2019-11-20 16:25:10 +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
Joao Moreno
5fdfdd7e6c git: use querystring instead of JSON for uris 2019-11-20 10:50:53 +01:00
Joao Moreno
fb2f985aa9 git.publish should not ask if only one remote
related to #84697
2019-11-20 10:12:31 +01:00
Joao Moreno
e055299e77 fix git commands 2019-11-20 09:37:02 +01:00
Joao Moreno
b6899391cd wip: comment out git data uris 2019-11-19 17:03:15 +01:00
Joao Moreno
b7ead236be git api: expose toGitUri 2019-11-19 16:54:41 +01:00
Joao Moreno
ff23412237 provide gitfs resource label formatter 2019-11-19 16:47:55 +01:00
Joao Moreno
31d13c8401 Merge remote-tracking branch 'origin/master' into joao/git-fs-provider 2019-11-14 11:10:41 +01:00
Joao Moreno
9f2592e261 gitfs: fix mtime 2019-11-14 10:31:18 +01:00
Joao Moreno
4583277fbd continuation of #84201 2019-11-12 12:11:15 +01:00
Joao Moreno
6f1d6c5c56 one more fix for #84201 2019-11-12 11:55:55 +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
062d516448 fixes #84201 2019-11-08 12:53:26 +01:00
Joao Moreno
15bfc40222 smaller footprint 2019-11-07 14:05:21 +01:00
Joao Moreno
467079f43d remove double action 2019-11-07 13:56:55 +01:00
Joao Moreno
5d60b7fdc4 wip: git fs provider 2019-11-07 11:31:01 +01:00
Daniel Imms
a0b9afd1e7 Merge pull request #83795 from microsoft/tyriar/icon_string
Move icons out of translated strings
2019-11-04 11:27:38 -08:00
Daniel Imms
3c282d45bd Move icons out of translated strings 2019-10-31 16:02:23 -07:00
Joao Moreno
d651044482 fixes #73613 2019-10-31 19:57:46 +01:00
Wojciech Buczek
0fb5275ac1 Merge branch 'master' into issue-76892 2019-10-29 23:19:11 +01:00
Wowol
a9ac61f06a Add support of relative paths for git.ignoredRepositories 2019-10-29 23:17:19 +01:00
Joao Moreno
32a529d1ca add modal to undo merge commit
related to #69937
2019-10-29 15:40:01 +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