Merge pull request #1 from sourcegraph/workspace-dir

Use environmentDir instead of workspaceDir

Author: KattMingMing

sourcegraph/c9build/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sourcegraph",
   "description": "Sourcegraph for C9",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "Sourcegraph",
   "contributors": [
     {

sourcegraph/c9build/package.sourcegraph.js

@@ -1,7 +1,7 @@
 define("plugins/sourcegraph/package.sourcegraph", [], {
     "name": "sourcegraph",
     "description": "Sourcegraph for C9",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "author": "Sourcegraph",
     "contributors": [
         {
@@ -48,8 +48,10 @@ define("plugins/sourcegraph/sourcegraph",[], function(require, exports, module)
     var settings = imports.settings
     var prefs = imports.preferences
     var proc = imports.proc
+    var environmentDir = imports.c9.environmentDir
     var workspaceDir = imports.c9.workspaceDir
     var tabs = imports.tabManager
+    var dirname = require('path').dirname
     var VERSION = '0.0.1'
 
     var plugin = new Plugin('Ajax.org', main.consumes)
@@ -221,13 +223,17 @@ define("plugins/sourcegraph/sourcegraph",[], function(require, exports, module)
     }
 
     function git(args, callback) {
-      if (typeof args == 'string') args = args.split(/\s+/)
+      var tab = tabs.focussedTab
+      var filePath = tab && tab.path
+      var baseDir = environmentDir || workspaceDir
+      var dirPath = dirname(baseDir + filePath)
 
+      if (typeof args == 'string') args = args.split(/\s+/)
       proc.spawn(
         'git',
         {
           args: args,
-          cwd: workspaceDir
+          cwd: dirPath
         },
         function(e, p) {
           buffer(p, function(stdout, stderr) {

sourcegraph/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sourcegraph",
   "description": "Sourcegraph for C9",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "Sourcegraph",
   "contributors": [
     {

sourcegraph/sourcegraph.js

@@ -17,8 +17,10 @@ define(function(require, exports, module) {
     var settings = imports.settings
     var prefs = imports.preferences
     var proc = imports.proc
+    var environmentDir = imports.c9.environmentDir
     var workspaceDir = imports.c9.workspaceDir
     var tabs = imports.tabManager
+    var dirname = require('path').dirname
     var VERSION = '0.0.1'
 
     /***** Initialization *****/
@@ -196,13 +198,17 @@ define(function(require, exports, module) {
     }
 
     function git(args, callback) {
-      if (typeof args == 'string') args = args.split(/\s+/)
+      var tab = tabs.focussedTab
+      var filePath = tab && tab.path
+      var baseDir = environmentDir || workspaceDir
+      var dirPath = dirname(baseDir + filePath)
 
+      if (typeof args == 'string') args = args.split(/\s+/)
       proc.spawn(
         'git',
         {
           args: args,
-          cwd: workspaceDir
+          cwd: dirPath
         },
         function(e, p) {
           buffer(p, function(stdout, stderr) {