Joao Moreno
58c6729a62
improve git isIdle implementation
...
related to #37417
2017-11-01 16:52:31 +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
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 867e521341
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
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
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
Johannes Rieken
d5880b1a59
deco - decorate ignored files
2017-10-17 17:19:36 +02:00
Johannes Rieken
41f0ff15d7
deco - move scm decorations to git extension
2017-10-17 12:49:56 +02:00
Benjamin Pasero
ca6a055ba2
git - once again fix broken selection syncing
2017-10-12 17:52:55 +02:00
Joao Moreno
1f058ae1cb
diff: fix stage/revert ranges
2017-10-11 17:17:10 +02:00
Joao Moreno
45fa36902e
diff: snappier stage
2017-10-11 15:27:37 +02:00
Joao Moreno
7d729c9d17
diff: inline actions
2017-10-11 15:16:47 +02:00
Johannes Rieken
e73da33e4f
add back untracked color, remove suffix for now
2017-10-10 17:09:35 +02:00
Johannes Rieken
73164106d5
simplify git decorations...
2017-10-10 17:09:34 +02:00
Johannes Rieken
5c109769f0
use ColorIdentifier instead of Color, define some git colors for untracked, modifed, and ignored
2017-10-10 17:08:53 +02:00
Joao Moreno
dfc3c944a4
remove unused variable
2017-10-10 16:05:37 +02:00
Joao Moreno
ccb7910128
git content provider checks the wrong cache key
...
fixes #35559
2017-10-10 10:22:11 +02:00
Brendan Forster
b1407a87b0
disable lookup for GitHub's version of Git
...
If the classic GitHub for Windows (creatively named github.exe) is installed alongside the new GitHub Desktop (which installs a github.bat file to PATH), we can get into the situation where Code can ask the GUI to authenticate for a private repository, which it doesn't understand.
2017-10-10 18:04:14 +11:00
Joao Moreno
58b990f3ef
be more careful with git init
...
fixes #35902
2017-10-09 14:52:10 +02:00
Joao Moreno
6a6b589eb8
fix compile errors
2017-10-04 15:43:48 +02:00
Joao Moreno
9b7a6b6fb9
fixes #35513
2017-10-04 15:01:32 +02:00
Joao Moreno
bcb3e0d00e
detect conflict markers when staging
...
fixes #33983
2017-10-03 10:21:20 +02:00
Markus Wolf
24a31523f9
Merge remote-tracking branch 'upstream/master' into git-clone-with-url
2017-10-02 12:24:56 +02:00
Markus Wolf
855a55d755
fix: use single remote automatically
...
If there is only one remote configured just use it instead of aksing the user which remote to use.
Closes #35373
2017-10-02 11:31:59 +02:00
Joao Moreno
3b76085a6c
fixes #35216
2017-09-28 11:51:40 +02:00
Joao Moreno
a13fdcbf50
Repository.close
...
fixes #35041
2017-09-28 11:09:44 +02:00
Joao Moreno
ae7e9613ce
fixes #34358
2017-09-28 10:05:20 +02:00
Joao Moreno
5b3d47b0bb
fixes #35044
2017-09-27 17:20:04 +02:00
Joao Moreno
826c2ae009
fix #33692
2017-09-27 16:47:42 +02:00
Joao Moreno
1ca31aa6db
git.ignore should detect workspaces
...
fixes #35176
2017-09-27 12:23:42 +02:00
kieferrm
08d8f0f9f6
indentation changes
2017-09-25 18:36:43 -07:00
kieferrm
fbb3e25987
omit endPoint where it defaults to none
2017-09-25 18:36:43 -07:00
