Joao Moreno
d2016c4ad0
Merge branch 'master' into fix/33739
2017-11-08 12:27:48 +01:00
Joao Moreno
948c568872
💄
2017-11-08 12:24:24 +01:00
Joao Moreno
07885099aa
Merge branch '31055-Sync-Rebase' of https://github.com/excerebrose/vscode into excerebrose-31055-Sync-Rebase
2017-11-08 12:20:10 +01:00
Joao Moreno
c432bc46a1
scm: move placeholder format to the outside
2017-11-08 12:14:48 +01:00
Joao Moreno
0a42516de8
Merge branch 'hui/scm-inputbox-placeholder' of https://github.com/huizhougit/vscode into huizhougit-hui/scm-inputbox-placeholder
2017-11-08 12:02:33 +01:00
João Moreno
e4bb48b1fe
Merge branch 'master' into git-ext-strict
2017-11-08 10:36:28 +01:00
João Moreno
d901df3fb0
any -> string
2017-11-08 10:34:44 +01:00
Matt Bierner
69832fddf6
use import mocha instead of <reference> for some tests
2017-11-07 14:54:20 -08:00
Matt Bierner
ab1d686a41
Fix a few more errors
2017-11-06 13:43:15 -08:00
Matt Bierner
b743e245ad
Enable strict compilation settings in git extension
...
Enables strict checks in the git extensions
2017-11-06 13:33:22 -08:00
Benjamin Pasero
1b36db4a99
⬆️ iconv-lite@0.4.19
2017-11-06 10:51:52 +01:00
Johannes Rieken
ff029d5589
fix #37596
2017-11-03 11:38:12 +01:00
Joao Moreno
58c6729a62
improve git isIdle implementation
...
related to #37417
2017-11-01 16:52:31 +01:00
Joao Moreno
16692ae72c
fixes #37226
2017-11-01 16:08:08 +01:00
Johannes Rieken
fe3f6cc861
fix #37331
2017-11-01 15:41:06 +01:00
Johannes Rieken
bab6929b45
also control icon appearance with git.decorations.enabled setting, #37299
2017-11-01 14:44:50 +01:00
Johannes Rieken
5efffdfcb4
add git.decorations.enabled setting, #37299
2017-11-01 14:44:50 +01:00
Johannes Rieken
1cafd15b44
fix #37403
2017-11-01 14:18:24 +01:00
Johannes Rieken
f502f70345
deco - align git color names
2017-10-30 16:44:51 +01:00
Joao Moreno
bb12d8de03
fixes #36213
2017-10-30 15:33:57 +01:00
Joao Moreno
63bfb446c4
Revert "dont read XDG_RUNTIME_DIR"
...
fixes #22593
This reverts commit 867e521341fc39ca6f1c7e10e1d4d27d1b85b963.
2017-10-30 15:13:52 +01:00
Joao Moreno
14064340e8
fixes #36984
2017-10-30 12:09:51 +01:00
Joao Moreno
d5c3e6b75a
git: use resource configuration
...
related to #37041
2017-10-27 16:21:21 +02:00
João Moreno
d3028fb5ca
Merge pull request #36974 from keegancsmith/fetch-noop
...
git: Throw fetch error
2017-10-27 15:48:15 +02:00
Keegan Carruthers-Smith
b4d51dcc6c
git: Sort RepositoryPicks to rank active repo first
2017-10-27 14:06:19 +02:00
João Moreno
178d05621f
Merge pull request #36971 from keegancsmith/git-error-to-string
...
git: Include GitErrorData in GitError.toString
2017-10-27 12:13:35 +02:00
Johannes Rieken
6c09f4aafc
don't report progress when running check-ignore, #36754
2017-10-27 11:15:28 +02:00
Johannes Rieken
47e1c93285
deco - use correct/overwrite decorations in scm viewlet because the same URI can have multiple decorations
2017-10-26 17:01:18 +02:00
Johannes Rieken
86cd46a44e
deco - allow to derive new decoration from existing decoration, add IDecorationData#source
2017-10-26 17:01:18 +02:00
Keegan Carruthers-Smith
fb47be0fa1
git: Throw fetch error
2017-10-26 12:26:46 +02:00
Keegan Carruthers-Smith
16089481f0
git: Include GitErrorData in GitError.toString
...
We are passing `GitErrorData` to `JSON.stringify` to include in the string
generated by `GitError.toString`. However, we set `replacer` to `[]`, which
means `JSON.stringify` will _always_ serialize to `{ }`. After this change
GitError messages should be more understandable, and not just say `Failed to
execute git`.
2017-10-26 11:32:48 +02:00
isidor
3e3d09021d
also use darker red for git deleted
2017-10-25 17:24:24 +02:00
isidor
5d93cd1543
git color decoration: a bit different colors for light theme
2017-10-25 17:20:44 +02:00
Johannes Rieken
51fa1659ac
deco - priority
2017-10-25 09:38:22 +02:00
Johannes Rieken
a0c26c8a1d
deco - show badge in scm viewlet when no icons are provided
2017-10-24 17:58:04 +02:00
Joao Moreno
6d6104b3fd
dont run git status after check-ignore
...
fixes #36552
2017-10-19 16:17:39 +02:00
Johannes Rieken
c9c409cb7b
deco - don't call check-ignore without files
2017-10-18 12:15:18 +02:00
Johannes Rieken
44bd7e3176
deco - don't check for ignored files outside the repo
2017-10-18 11:44:55 +02:00
Johannes Rieken
71d332b464
deco - remove opacity, use colors only, remove provider label from proposed api
2017-10-18 10:36:47 +02:00
Johannes Rieken
ca2c107324
deco - update decorations when gitignore-file changes
2017-10-18 10:06:13 +02:00
Johannes Rieken
5faa72ac39
deco - use a color for ignored files
2017-10-18 09:03:15 +02:00
BattleBas
170161d67f
Simplified method to check active file
...
Updated the "detectActiveFile" method to be more simple and straightforward.
Thanks to @lodenrogue suggestion!
2017-10-17 22:23:52 -05:00
Johannes Rieken
d5880b1a59
deco - decorate ignored files
2017-10-17 17:19:36 +02:00
Stuart Baker
3afbdb4126
Ask to publish branch if there is no upstream
2017-10-17 14:38:08 +01:00
Johannes Rieken
41f0ff15d7
deco - move scm decorations to git extension
2017-10-17 12:49:56 +02:00
Peter Kahle
124b9a4032
Cleaning up handling of Git Submodule status
2017-10-15 21:16:45 -04:00
Peter Kahle
b97bad54b1
When clicking on a changed submodule in the git window, do nothing.
2017-10-15 20:46:07 -04:00
Peter Kahle
472349046b
Sorting repositories when searching by Uri to ensure nested repositories are found if appropriate.
2017-10-13 08:50:11 -04:00
Peter Kahle
9e2338a8c7
First, naive pass at supporting submodules.
...
Scan for submodules when a module is added, and add those repositories immediately.
2017-10-12 21:43:25 -04:00
BattleBas
6c40a968f4
Added setting "git.autoRepositoryDetection"
...
When opening just one file, the setting "autoRepositoryDetection" allows the user to control whether the entire repository changes will be displayed or just the changes of the current file.
2017-10-12 20:19:07 -05:00
