Commit Graph

257 Commits

Author SHA1 Message Date
Eric Amodio 3f6843956a Refactors timeline to work better w/ multi sources
Separates the tree rendering from the data model cache
Fixes many issues and simplifies the code
2020-03-20 04:00:52 -04:00
Eric Amodio d46c8a8c3c Lots of timeline related changes, below
UI:
Adds Refresh icon to view title
Adds "Load more" entry at the end of the list for paging

API:
Restructures api around cursors
Renames TimelineCursor to generic TimelineOptions for more flexibility
Adds paging object to Timeline for clearer paging usage
Changes cursors to be strings, and explicit before and after cursors
Allows limit to take a cursor, so we can reload current data set
Clarifies id and fallback to timestamp
Adds reset flag to TimelineChangeEvent for providers to reset caching

Git provider:
Orders and returns commit date as the timestamp
Supports limit of a cursor (using rev-list --count)
Stops returning working/index changes when paging
Forcably resets cached data when changes are detected (naive for now)
2020-02-24 15:48:37 -05:00
Joao Moreno fe884b305e Revert "Revert "Fix #88294 Add commitData in commit interface""
This reverts commit aa70f38ab2.
2020-02-18 12:56:07 +01:00
Alex Dima aa70f38ab2 Revert "Fix #88294 Add commitData in commit interface"
This reverts commit 51b8bd5064.
2020-02-18 12:48:22 +01:00
Jiayue. Zhang ee6278b01e Merge branch 'master' into issue/88294 2020-02-13 00:06:47 +09:00
Eric Amodio 5cb987119a Fixes #90229 2020-02-10 14:52:22 -05:00
Joao Moreno 16c7551f36 move git smoke tests to integration tests 2020-02-04 17:06:49 +01:00
Jiayue. Zhang b61b242503 Merge branch 'master' into issue/88294 2020-01-31 15:49:40 +09: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
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 87c2332fed Adds timeline diff on click and icon support 2020-01-27 15:28:33 -05: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 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 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
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
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 2c0115ec8c fix compile errors 2019-10-25 11:36:06 +02:00
Joao Moreno 980fb4b0ff Merge commit 'refs/pull/76342/head' of github.com:microsoft/vscode into pr/76342 2019-10-25 11:32:15 +02:00
Joao Moreno f402575486 cleanup git delete tag command 2019-10-24 15:27:57 +02:00
Joao Moreno 23a4df3672 Merge commit 'refs/pull/74345/head' of github.com:microsoft/vscode into pr/74345 2019-10-24 15:13:29 +02:00
Anirudh Rayabharam 7b1a6c822a Git: Fixed error when staging in empty repository
Trying to stage a commit in an empty repository (i.e. no prior commits)
results in a git fatal error. This is because in an empty repo, HEAD
doesn't point to anything causing `git ls-tree -l HEAD ...` to fail.

To fix this, send `treeish` as `'HEAD'` to `getObjectDetails()` only if
there is at least one commit in the repo. Else, send an empty string
causing `getObjectDetails()` to use `lsFiles` instead of `lsTree`.

Fixes #82026
2019-10-21 22:04:03 +05:30
João Moreno ad9bce8978 Merge pull request #82038 from jeanp413/fix-81158
Fix git repository not detected if root folder ends in [space]
2019-10-21 16:01:18 +02:00
Joao Moreno f367d0fe20 skip auth only for auto fetch
related to #72615
2019-10-17 16:19:26 +02:00
Joao Moreno f901a47197 💄 git clone progress 2019-10-17 14:08:40 +02:00
Joao Moreno 471b263ce5 Merge commit 'refs/pull/71341/head' of github.com:microsoft/vscode into pr/71341 2019-10-17 12:53:45 +02:00
Joao Moreno d5664e35ed cleanup commit template, merge
related to #66522
2019-10-15 17:43:33 +02:00
Joao Moreno 4a80681a01 Merge commit 'refs/pull/66522/head' of github.com:microsoft/vscode into pr/66522 2019-10-15 17:16:42 +02:00
jeanp413 5d2eb0a06e Fixes #81158 2019-10-06 23:31:49 -05:00
Joao Moreno fe44d14e71 fixes #80415 2019-09-06 09:40:08 +02:00
João Moreno b3f85bc76d fix git branch sort order (#80096) 2019-08-30 10:27:20 +02:00
Xhulio Hasani 32d59ba806 Added quickpick option and display of tag annotation on menu 2019-08-20 16:05:46 -04:00
Joao Moreno 22a3f3ec83 💄 2019-08-13 09:54:20 +02:00
Joao Moreno 2c878484c8 Merge commit 'refs/pull/78695/head' of github.com:microsoft/vscode into pr/78695 2019-08-13 09:46:54 +02:00
Joao Moreno 264d6ac829 💄 2019-08-12 14:06:53 +02:00
Joao Moreno 28bcf28232 Merge commit 'refs/pull/78562/head' of github.com:microsoft/vscode into pr/78562 2019-08-12 09:41:30 +02:00
Xhulio Hasani 98ed0fc2e8 Merge branch 'master' of https://github.com/microsoft/vscode 2019-08-11 19:50:41 -04:00
Joao Moreno 2c189f373f fix capture group 2019-08-08 16:38:39 +02:00
Joao Moreno daf581da39 fixes #71258 2019-08-08 16:30:47 +02:00
skprabhanjan 1556800102 Fix fix-64077 With a setting 2019-08-08 16:14:23 +05:30
Joao Moreno 5481dcca5e Merge commit 'refs/pull/71710/head' of github.com:microsoft/vscode into pr/71710 2019-08-08 12:17:46 +02:00
Joao Moreno 181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
João Moreno b8a8085ad1 Merge branch 'master' into rievans/gitpushbranchwithsymbolfail 2019-08-07 11:51:55 +02:00
Joao Moreno a6177d979a cleanup for pr #66095 2019-08-06 17:49:42 +02:00
Darrien Singleton b93c4fa3b5 new branch 2019-08-06 09:22:17 -04:00
Joao Moreno 54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00