Skip to content

Commit c34ed2d

Browse files
eamodioeamodio
committed
Adds history explorer
1 parent c42b166 commit c34ed2d

33 files changed

+629
-206
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
66

77
## [8.2.0-beta] - 2018-03-26
88
### Added
9+
- Adds new *GitLens History* explorer to explore the history of the current file — same as the history view in the *GitLens* explorer when undocked
10+
11+
![GitLens History explorer](https://raw.githubusercontent.com/eamodio/vscode-gitlens/master/images/ss-gitlens-history-explorer.png)
12+
913
- Adds rich tooltip details to the *GitLens* explorer and *GitLens Results* view
1014
- Adds richer working tree and upstream status information to branches in the *GitLens* explorer
1115
- Adds an indicator to the *GitLens* explorer's branch history to mark the synchronization point between the local and remote branch (if available)

‎README.md‎

Lines changed: 48 additions & 22 deletions
Large diffs are not rendered by default.

‎images/cl-history-explorer.png‎

62 KB
Loading

‎images/dark/icon-dock.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎images/dark/icon-undock.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎images/light/icon-dock.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎images/light/icon-undock.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎images/ss-gitlens-explorer-history.png‎

124 Bytes
Loading

‎images/ss-gitlens-history-explorer.png‎

62 KB
Loading

‎package.json‎

Lines changed: 134 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@
472472
"history",
473473
"repository"
474474
],
475-
"description": "Specifies the starting view (mode) of the `GitLens` explorer\n `auto` - shows the last selected view, defaults to `repository`\n `history` - shows the commit history of the active file\n `repository` - shows a repository explorer",
475+
"description": "Specifies the starting view of the `GitLens` explorer\n `auto` - shows the last selected view, defaults to `repository`\n `history` - shows the commit history of the current file\n `repository` - shows a repository explorer",
476476
"scope": "window"
477477
},
478478
"gitlens.heatmap.toggleMode": {
@@ -485,6 +485,12 @@
485485
"description": "Specifies how the gutter heatmap annotations will be toggled\n `file` - toggle each file individually\n `window` - toggle the window, i.e. all files at once",
486486
"scope": "window"
487487
},
488+
"gitlens.historyExplorer.enabled": {
489+
"type": "boolean",
490+
"default": false,
491+
"description": "Specifies whether to show the current file history undocked in a `GitLens History` explorer",
492+
"scope": "window"
493+
},
488494
"gitlens.hovers.annotations.changes": {
489495
"type": "boolean",
490496
"default": true,
@@ -1554,6 +1560,15 @@
15541560
"title": "Delete Tag (via Terminal)",
15551561
"category": "GitLens"
15561562
},
1563+
{
1564+
"command": "gitlens.gitExplorer.undockHistory",
1565+
"title": "Undock History from GitLens Explorer",
1566+
"category": "GitLens",
1567+
"icon": {
1568+
"dark": "images/dark/icon-undock.svg",
1569+
"light": "images/light/icon-undock.svg"
1570+
}
1571+
},
15571572
{
15581573
"command": "gitlens.gitExplorer.refresh",
15591574
"title": "Refresh",
@@ -1621,6 +1636,48 @@
16211636
"light": "images/light/icon-repo.svg"
16221637
}
16231638
},
1639+
{
1640+
"command": "gitlens.historyExplorer.close",
1641+
"title": "Close",
1642+
"category": "GitLens",
1643+
"icon": {
1644+
"dark": "images/dark/icon-close.svg",
1645+
"light": "images/light/icon-close.svg"
1646+
}
1647+
},
1648+
{
1649+
"command": "gitlens.historyExplorer.dock",
1650+
"title": "Dock History to GitLens Explorer",
1651+
"category": "GitLens",
1652+
"icon": {
1653+
"dark": "images/dark/icon-dock.svg",
1654+
"light": "images/light/icon-dock.svg"
1655+
}
1656+
},
1657+
{
1658+
"command": "gitlens.historyExplorer.refresh",
1659+
"title": "Refresh",
1660+
"category": "GitLens",
1661+
"icon": {
1662+
"dark": "images/dark/icon-refresh.svg",
1663+
"light": "images/light/icon-refresh.svg"
1664+
}
1665+
},
1666+
{
1667+
"command": "gitlens.historyExplorer.refreshNode",
1668+
"title": "Refresh",
1669+
"category": "GitLens"
1670+
},
1671+
{
1672+
"command": "gitlens.historyExplorer.setRenameFollowingOn",
1673+
"title": "Follow Renames",
1674+
"category": "GitLens"
1675+
},
1676+
{
1677+
"command": "gitlens.historyExplorer.setRenameFollowingOff",
1678+
"title": "Don't Follow Renames",
1679+
"category": "GitLens"
1680+
},
16241681
{
16251682
"command": "gitlens.resultsExplorer.clearResultsNode",
16261683
"title": "Clear Results",
@@ -2044,11 +2101,39 @@
20442101
},
20452102
{
20462103
"command": "gitlens.gitExplorer.switchToHistoryView",
2047-
"when": "gitlens:enabled && gitlens:gitExplorer:view == repository"
2104+
"when": "gitlens:enabled && !gitlens:historyExplorer && gitlens:gitExplorer:view == repository"
20482105
},
20492106
{
20502107
"command": "gitlens.gitExplorer.switchToRepositoryView",
2051-
"when": "gitlens:enabled && gitlens:gitExplorer:view == history"
2108+
"when": "gitlens:enabled && !gitlens:historyExplorer && gitlens:gitExplorer:view == history"
2109+
},
2110+
{
2111+
"command": "gitlens.gitExplorer.undockHistory",
2112+
"when": "gitlens:enabled && !gitlens:historyExplorer"
2113+
},
2114+
{
2115+
"command": "gitlens.historyExplorer.close",
2116+
"when": "false"
2117+
},
2118+
{
2119+
"command": "gitlens.historyExplorer.dock",
2120+
"when": "gitlens:enabled && gitlens:historyExplorer"
2121+
},
2122+
{
2123+
"command": "gitlens.historyExplorer.refresh",
2124+
"when": "false"
2125+
},
2126+
{
2127+
"command": "gitlens.historyExplorer.refreshNode",
2128+
"when": "false"
2129+
},
2130+
{
2131+
"command": "gitlens.historyExplorer.setRenameFollowingOn",
2132+
"when": "false"
2133+
},
2134+
{
2135+
"command": "gitlens.historyExplorer.setRenameFollowingOff",
2136+
"when": "false"
20522137
},
20532138
{
20542139
"command": "gitlens.resultsExplorer.clearResultsNode",
@@ -2321,19 +2406,24 @@
23212406
"group": "navigation@1"
23222407
},
23232408
{
2324-
"command": "gitlens.gitExplorer.switchToHistoryView",
2325-
"when": "view == gitlens.gitExplorer && gitlens:gitExplorer:view == repository",
2409+
"command": "gitlens.gitExplorer.undockHistory",
2410+
"when": "view == gitlens.gitExplorer && gitlens:gitExplorer:view == history && !gitlens:historyExplorer",
23262411
"group": "navigation@2"
23272412
},
2413+
{
2414+
"command": "gitlens.gitExplorer.switchToHistoryView",
2415+
"when": "view == gitlens.gitExplorer && !gitlens:historyExplorer && gitlens:gitExplorer:view == repository",
2416+
"group": "navigation@3"
2417+
},
23282418
{
23292419
"command": "gitlens.gitExplorer.switchToRepositoryView",
2330-
"when": "view == gitlens.gitExplorer && gitlens:gitExplorer:view == history",
2420+
"when": "view == gitlens.gitExplorer && !gitlens:historyExplorer && gitlens:gitExplorer:view == history",
23312421
"group": "navigation@3"
23322422
},
23332423
{
23342424
"command": "gitlens.gitExplorer.refresh",
23352425
"when": "view == gitlens.gitExplorer",
2336-
"group": "navigation@4"
2426+
"group": "navigation@8"
23372427
},
23382428
{
23392429
"command": "gitlens.gitExplorer.setFilesLayoutToAuto",
@@ -2370,6 +2460,31 @@
23702460
"when": "view == gitlens.gitExplorer && gitlens:gitExplorer:view == history && config.gitlens.advanced.fileHistoryFollowsRenames",
23712461
"group": "2_gitlens_1"
23722462
},
2463+
{
2464+
"command": "gitlens.historyExplorer.refresh",
2465+
"when": "view == gitlens.historyExplorer",
2466+
"group": "navigation@1"
2467+
},
2468+
{
2469+
"command": "gitlens.historyExplorer.dock",
2470+
"when": "view == gitlens.historyExplorer && gitlens:gitExplorer",
2471+
"group": "navigation@9"
2472+
},
2473+
{
2474+
"command": "gitlens.historyExplorer.close",
2475+
"when": "view == gitlens.historyExplorer && !gitlens:gitExplorer",
2476+
"group": "navigation@9"
2477+
},
2478+
{
2479+
"command": "gitlens.historyExplorer.setRenameFollowingOn",
2480+
"when": "view == gitlens.historyExplorer && !config.gitlens.advanced.fileHistoryFollowsRenames",
2481+
"group": "1_gitlens"
2482+
},
2483+
{
2484+
"command": "gitlens.historyExplorer.setRenameFollowingOff",
2485+
"when": "view == gitlens.historyExplorer && config.gitlens.advanced.fileHistoryFollowsRenames",
2486+
"group": "1_gitlens"
2487+
},
23732488
{
23742489
"command": "gitlens.showCommitSearch",
23752490
"when": "view == gitlens.resultsExplorer",
@@ -2694,12 +2809,17 @@
26942809
},
26952810
{
26962811
"command": "gitlens.gitExplorer.refreshNode",
2697-
"when": "view =~ /gitlens\\.gitExplorer/ && viewItem =~ /gitlens:(?!file\\b)/",
2812+
"when": "view == gitlens.gitExplorer && viewItem =~ /gitlens:(?!file\\b)/",
26982813
"group": "9_gitlens@1"
26992814
},
27002815
{
27012816
"command": "gitlens.resultsExplorer.refreshNode",
2702-
"when": "view =~ /gitlens\\.resultsExplorer/ && viewItem =~ /gitlens:(?!file\\b)/",
2817+
"when": "view == gitlens.resultsExplorer && viewItem =~ /gitlens:(?!file\\b)/",
2818+
"group": "9_gitlens@1"
2819+
},
2820+
{
2821+
"command": "gitlens.historyExplorer.refreshNode",
2822+
"when": "view == gitlens.historyExplorer && viewItem =~ /gitlens:(?!file\\b)/",
27032823
"group": "9_gitlens@1"
27042824
}
27052825
]
@@ -2886,6 +3006,11 @@
28863006
"name": "GitLens",
28873007
"when": "gitlens:enabled && gitlens:gitExplorer"
28883008
},
3009+
{
3010+
"id": "gitlens.historyExplorer",
3011+
"name": "GitLens History",
3012+
"when": "gitlens:enabled && gitlens:historyExplorer"
3013+
},
28893014
{
28903015
"id": "gitlens.resultsExplorer",
28913016
"name": "GitLens Results",

0 commit comments

Comments
 (0)