Commit Graph

135 Commits

Author SHA1 Message Date
Joao Moreno
6e909d4132 git: expose error codes in API 2018-08-24 12:24:37 +02:00
Joao Moreno
103715c3cc git: implement API 2018-08-24 12:04:29 +02:00
Joao Moreno
28d2b5d2d6 wip: git api 2018-08-24 11:19:05 +02:00
Joao Moreno
6d2598ad88 git api: repository state 2018-08-24 11:16:49 +02:00
Joao Moreno
f9982d29d4 git api: make cwd mandatory 2018-08-22 13:06:26 +02:00
Joao Moreno
bcdad4c79f fixes #53520 2018-07-18 11:12:06 +02:00
Joao Moreno
19df280c7f fixes #53849 2018-07-09 10:37:51 +02:00
Joao Moreno
b6781b0058 align lstree implementations 2018-07-06 16:45:03 +02:00
Joao Moreno
00a1abe912 cleanup git relative path calculation 2018-07-06 16:37:53 +02:00
Joao Moreno
3f9e71722d Merge commit 'refs/pull/49397/head' of github.com:Microsoft/vscode into pr/49397 2018-07-06 15:46:10 +02:00
Joao Moreno
ba98812272 💄 2018-07-06 15:31:43 +02:00
Joao Moreno
e4d42b6b9b Merge commit 'refs/pull/47578/head' of github.com:Microsoft/vscode into pr/47578 2018-07-06 15:23:18 +02:00
Joao Moreno
e045147e44 improve conflicts during git rebase flow 2018-07-06 12:15:27 +02:00
Joao Moreno
c693ba29c3 git: 💄 no_push feature 2018-06-04 16:48:47 +02:00
Joao Moreno
fb29dd0706 Merge commit 'refs/pull/45341/head' of github.com:Microsoft/vscode into pr/45341 2018-06-04 16:33:06 +02:00
Alex Ross
375411e631 Fixes #48714: Added conversion from local case of the file to git case. This does not fix the view in the Explorer, but this solution should be easy to apply to that issue too. 2018-05-07 11:37:17 -07:00
Joao Moreno
02bcbbc8da pick different folder names for git clone
fixes #48485
2018-04-26 11:33:55 +02:00
Joao Moreno
5ded9d963a cleanup git clone error
fixes #48486
2018-04-25 19:31:05 +02:00
Joao Moreno
8b69e6db6b fixes #46854 2018-04-25 15:40:45 +02:00
Joao Moreno
7cf50421da fixes #48211 2018-04-25 09:04:41 +02:00
Ryuichi Inagaki
6b7a644082 ref #44776 Only test the logic of parsing git show output
* Instead of testing it through `getCommit` as we don't use stub in test
2018-04-11 20:02:20 +10:00
Ryuichi Inagaki
91414f62cf ref #44776 Introduced deleteRef method on git.Repository 2018-04-10 21:01:56 +10:00
Ryuichi Inagaki
ac63779dca ref #44776 Cater for the cases of multiple/no previous hashes 2018-04-10 21:01:55 +10:00
Ryuichi Inagaki
3fdf0bcc56 ref #44776 Get previous commits as part of commit info 2018-04-10 21:01:41 +10:00
Joao Moreno
42c882151f only detect git encoding if files.autoGuessEncoding is enabled
fixes #46826
2018-03-28 12:52:10 +02:00
Joao Moreno
ab149aba6e fixes #21146 2018-03-27 14:50:53 +02:00
Joao Moreno
ee25b62029 fixes #46144 2018-03-20 10:17:01 +01:00
Tomáš Hübelbauer
21325bef88 Hide ahead push arrow if remote push URL is no_push
Closes Microsoft/vscode#45271
2018-03-08 22:02:29 +01:00
Joao Moreno
c889303366 fixes #44802 2018-03-02 17:32:33 +01:00
Joao Moreno
2288e7cecd improve git logging 2018-02-23 10:21:06 +01:00
Joao Moreno
ca58c21bfc fixes #44188 2018-02-22 10:22:19 +01:00
Matt Bierner
308c1887df Update extensions for TS 2.7
Update src to build with TS 2.7

Explicitly assign this.message in the else body
2018-02-08 14:28:55 -08:00
Joao Moreno
2860393643 fixes #43014 2018-02-08 17:10:20 +01:00
João Moreno
8f76a4d0d3 Merge pull request #38563 from graknol/master
Git branches sorted by committerdate, latest first.
2017-12-15 15:51:10 +01:00
Joao Moreno
9622ada626 find git in LocalAppData and PATH, win32
fixes #40229
2017-12-15 10:38:02 +01:00
Joao Moreno
ea831c196a fixes #40156 2017-12-14 16:15:38 +01:00
Joao Moreno
c84266207a revert submodule change with update command 2017-12-14 11:21:27 +01:00
Joao Moreno
9f131c1762 more submodule support, diff colorization 2017-12-13 16:21:12 +01:00
Joao Moreno
13bb4c9b85 detect submodules, make them a part of status 2017-12-13 12:03:53 +01:00
Joao Moreno
26b8508db1 Merge branch 'git-submodules' of https://github.com/petkahl/vscode into petkahl-git-submodules 2017-12-13 10:31:47 +01:00
João Moreno
2aa0d24cf6 Merge pull request #36420 from smbkr/push-ask-upstream
Git - Ask to publish branch if there is no upstream
2017-12-12 16:55:56 +01:00
Joel Kuntz
454bf5bdce Fix #39867 fix git popStash type check 2017-12-07 08:53:05 -04:00
Joao Moreno
618e3806c3 fix missing reference 2017-12-05 10:50:21 +01:00
Joao Moreno
000325a03b alert when git is missing
fixes #38393
2017-11-17 11:35:49 +01:00
Sindre Tellevik
924b1002bb Git branches sorted by committerdate, latest first. 2017-11-17 00:09:23 +01:00
Joao Moreno
fe20886713 don't spawn git on Windows
fixes #32739
2017-11-10 17:50:13 +01:00
Joao Moreno
12c41aa9bd Merge branch '34527' of https://github.com/raouldc/vscode into raouldc-34527 2017-11-10 17:03:06 +01:00
Joao Moreno
57b2a86868 Merge branch 'justinhhorner-git-rename-branch' of https://github.com/justinhhorner/vscode into justinhhorner-justinhhorner-git-rename-branch 2017-11-10 16:51:44 +01:00
Joao Moreno
55882309c8 git: cancel clone
fixes #30057
2017-11-10 16:22:12 +01:00
Joao Moreno
e730a65f7a git image diff: fix index 2017-11-09 18:22:45 +01:00