consolidate git extensions

related to #43978

extensions/git/.vscodeignore

@@ -1,4 +1,5 @@
 src/**
 test/**
 out/test/**
-tsconfig.json
+tsconfig.json
+build/**

extensions/git/OSSREADME.json

@@ -1,29 +1,42 @@
 // ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
-[{
+[
-	"name": "textmate/git.tmbundle",
+	{
-	"version": "0.0.0",
+		"name": "textmate/git.tmbundle",
-	"license": "MIT",
+		"version": "0.0.0",
-	"repositoryURL": "https://github.com/textmate/git.tmbundle",
+		"license": "MIT",
-	"licenseDetail": [
+		"repositoryURL": "https://github.com/textmate/git.tmbundle",
-		"Copyright (c) 2008 Tim Harper",
+		"licenseDetail": [
-		"",
+			"Copyright (c) 2008 Tim Harper",
-		"Permission is hereby granted, free of charge, to any person obtaining",
+			"",
-		"a copy of this software and associated documentation files (the\"",
+			"Permission is hereby granted, free of charge, to any person obtaining",
-		"Software\"), to deal in the Software without restriction, including",
+			"a copy of this software and associated documentation files (the\"",
-		"without limitation the rights to use, copy, modify, merge, publish,",
+			"Software\"), to deal in the Software without restriction, including",
-		"distribute, sublicense, and/or sell copies of the Software, and to",
+			"without limitation the rights to use, copy, modify, merge, publish,",
-		"permit persons to whom the Software is furnished to do so, subject to",
+			"distribute, sublicense, and/or sell copies of the Software, and to",
-		"the following conditions:",
+			"permit persons to whom the Software is furnished to do so, subject to",
-		"",
+			"the following conditions:",
-		"The above copyright notice and this permission notice shall be",
+			"",
-		"included in all copies or substantial portions of the Software.",
+			"The above copyright notice and this permission notice shall be",
-		"",
+			"included in all copies or substantial portions of the Software.",
-		"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
+			"",
-		"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
+			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
-		"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
+			"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
-		"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
+			"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
-		"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
+			"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
-		"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
+			"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-		"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
+			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
-	]
+			"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
-}]
+		]
+	},
+	{
+		"name": "textmate/diff.tmbundle",
+		"version": "0.0.0",
+		"repositoryURL": "https://github.com/textmate/diff.tmbundle",
+		"licenseDetail": [
+			"Permission to copy, use, modify, sell and distribute this",
+			"software is granted. This software is provided \"as is\" without",
+			"express or implied warranty, and with no claim as to its",
+			"suitability for any purpose."
+		]
+	}
+]

extensions/git/package.json

@@ -1,8 +1,8 @@
 {
   "name": "git",
+  "displayName": "%displayName%",
+  "description": "%description%",
   "publisher": "vscode",
-  "displayName": "git",
-  "description": "Git",
   "version": "0.0.1",
   "engines": {
     "vscode": "^1.5.0"
@@ -18,7 +18,8 @@
   "main": "./out/main",
   "scripts": {
     "compile": "gulp compile-extension:git",
-    "watch": "gulp watch-extension:git"
+    "watch": "gulp watch-extension:git",
+    "update-grammar": "node ./build/update-grammars.js"
   },
   "contributes": {
     "commands": [
@@ -1020,7 +1021,69 @@
           "highContrast": "#8db9e2"
         }
       }
-    ]
+    ],
+    "languages": [
+      {
+        "id": "git-commit",
+        "aliases": [
+          "Git Commit Message",
+          "git-commit"
+        ],
+        "filenames": [
+          "COMMIT_EDITMSG",
+          "MERGE_MSG"
+        ],
+        "configuration": "./languages/git-commit.language-configuration.json"
+      },
+      {
+        "id": "git-rebase",
+        "aliases": [
+          "Git Rebase Message",
+          "git-rebase"
+        ],
+        "filenames": [
+          "git-rebase-todo"
+        ],
+        "configuration": "./languages/git-rebase.language-configuration.json"
+      },
+      {
+        "id": "diff",
+        "aliases": [
+          "Diff",
+          "diff"
+        ],
+        "extensions": [
+          ".patch",
+          ".diff",
+          ".rej"
+        ],
+        "configuration": "./languages/diff.language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "git-commit",
+        "scopeName": "text.git-commit",
+        "path": "./syntaxes/git-commit.tmLanguage.json"
+      },
+      {
+        "language": "git-rebase",
+        "scopeName": "text.git-rebase",
+        "path": "./syntaxes/git-rebase.tmLanguage.json"
+      },
+      {
+        "language": "diff",
+        "scopeName": "source.diff",
+        "path": "./syntaxes/diff.tmLanguage.json"
+      }
+    ],
+    "configurationDefaults": {
+      "[git-commit]": {
+        "editor.rulers": [
+          72
+        ]
+      }
+    }
   },
   "dependencies": {
     "byline": "^5.0.0",

extensions/git/package.nls.json

@@ -1,4 +1,6 @@
 {
+	"displayName": "Git",
+	"description": "Git SCM Integration",
 	"command.clone": "Clone",
 	"command.init": "Initialize Repository",
 	"command.close": "Close Repository",

extensions/gitsyntax/.vscodeignore

@@ -1,2 +0,0 @@
-test/**
-build/**

extensions/gitsyntax/OSSREADME.json

@@ -1,42 +0,0 @@
-// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
-[
-	{
-		"name": "textmate/git.tmbundle",
-		"version": "0.0.0",
-		"license": "MIT",
-		"repositoryURL": "https://github.com/textmate/git.tmbundle",
-		"licenseDetail": [
-			"Copyright (c) 2008 Tim Harper",
-			"",
-			"Permission is hereby granted, free of charge, to any person obtaining",
-			"a copy of this software and associated documentation files (the\"",
-			"Software\"), to deal in the Software without restriction, including",
-			"without limitation the rights to use, copy, modify, merge, publish,",
-			"distribute, sublicense, and/or sell copies of the Software, and to",
-			"permit persons to whom the Software is furnished to do so, subject to",
-			"the following conditions:",
-			"",
-			"The above copyright notice and this permission notice shall be",
-			"included in all copies or substantial portions of the Software.",
-			"",
-			"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,",
-			"EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF",
-			"MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND",
-			"NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE",
-			"LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION",
-			"OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION",
-			"WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
-		]
-	},
-	{
-		"name": "textmate/diff.tmbundle",
-		"version": "0.0.0",
-		"repositoryURL": "https://github.com/textmate/diff.tmbundle",
-		"licenseDetail": [
-			"Permission to copy, use, modify, sell and distribute this",
-			"software is granted. This software is provided \"as is\" without",
-			"express or implied warranty, and with no claim as to its",
-			"suitability for any purpose."
-		]
-	}
-]

extensions/gitsyntax/package.json

@@ -1,80 +0,0 @@
-{
-  "name": "gitsyntax",
-  "publisher": "vscode",
-  "displayName": "gitsyntax",
-  "description": "Git Syntax",
-  "version": "0.0.1",
-  "engines": {
-    "vscode": "^1.5.0"
-  },
-  "categories": [
-    "Other"
-  ],
-  "scripts": {
-    "update-grammar": "node ./build/update-grammars.js"
-  },
-  "contributes": {
-    "languages": [
-      {
-        "id": "git-commit",
-        "aliases": [
-          "Git Commit Message",
-          "git-commit"
-        ],
-        "filenames": [
-          "COMMIT_EDITMSG",
-          "MERGE_MSG"
-        ],
-        "configuration": "./git-commit.language-configuration.json"
-      },
-      {
-        "id": "git-rebase",
-        "aliases": [
-          "Git Rebase Message",
-          "git-rebase"
-        ],
-        "filenames": [
-          "git-rebase-todo"
-        ],
-        "configuration": "./git-rebase.language-configuration.json"
-      },
-      {
-        "id": "diff",
-        "aliases": [
-          "Diff",
-          "diff"
-        ],
-        "extensions": [
-          ".patch",
-          ".diff",
-          ".rej"
-        ],
-        "configuration": "./diff.language-configuration.json"
-      }
-    ],
-    "grammars": [
-      {
-        "language": "git-commit",
-        "scopeName": "text.git-commit",
-        "path": "./syntaxes/git-commit.tmLanguage.json"
-      },
-      {
-        "language": "git-rebase",
-        "scopeName": "text.git-rebase",
-        "path": "./syntaxes/git-rebase.tmLanguage.json"
-      },
-      {
-        "language": "diff",
-        "scopeName": "source.diff",
-        "path": "./syntaxes/diff.tmLanguage.json"
-      }
-    ],
-    "configurationDefaults": {
-      "[git-commit]": {
-        "editor.rulers": [
-          72
-        ]
-      }
-    }
-  }
-}