Fix import command so it works if Lerna root is a subdir of git root

src/GitUtilities.js

@@ -150,6 +150,14 @@ export default class GitUtilities {
     return diff;
   }
 
+  static getWorkspaceRoot(opts) {
+    log.silly("getWorkspaceRoot");
+    const root = ChildProcessUtilities.execSync("git", ["rev-parse", "--show-toplevel"], opts);
+    log.verbose("getWorkspaceRoot", root);
+
+    return root;
+  }
+
   static getCurrentBranch(opts) {
     log.silly("getCurrentBranch");
 

src/commands/ImportCommand.js

@@ -73,10 +73,17 @@ export default class ImportCommand extends Command {
     }
 
     const targetBase = getTargetBase(this.repository.packageConfigs);
-    this.targetDir = path.join(targetBase, externalRepoBase);
 
-    if (FileSystemUtilities.existsSync(path.resolve(this.repository.rootPath, this.targetDir))) {
-      return callback(new Error(`Target directory already exists "${this.targetDir}"`));
+    // Compute a target directory relative to the Lerna root
+    const targetDir = path.join(targetBase, externalRepoBase);
+
+    // Compute a target directory relative to the Git root
+    const gitRepoRoot = GitUtilities.getWorkspaceRoot(this.execOpts);
+    const lernaRootRelativeToGitRoot = path.relative(gitRepoRoot, this.repository.rootPath);
+    this.targetDirRelativeToGitRoot = path.join(lernaRootRelativeToGitRoot, targetDir);
+
+    if (FileSystemUtilities.existsSync(path.resolve(this.repository.rootPath, targetDir))) {
+      return callback(new Error(`Target directory already exists "${targetDir}"`));
     }
 
     this.commits = this.externalExecSync("git", this.gitParamsForTargetCommits())
@@ -103,7 +110,7 @@ export default class ImportCommand extends Command {
 
     this.logger.info(
       "",
-      `About to import ${this.commits.length} commits from ${inputPath} into ${this.targetDir}`,
+      `About to import ${this.commits.length} commits from ${inputPath} into ${targetDir}`,
     );
 
     if (this.options.yes) {
@@ -142,7 +149,7 @@ export default class ImportCommand extends Command {
       patch = this.externalExecSync("git", ["format-patch", "-1", sha, "--stdout"]);
     }
 
-    const formattedTarget = this.targetDir.replace(/\\/g, "/");
+    const formattedTarget = this.targetDirRelativeToGitRoot.replace(/\\/g, "/");
     const replacement = `$1/${formattedTarget}`;
     // Create a patch file for this commit and prepend the target directory
     // to all affected files.  This moves the git history for the entire

test/GitUtilities.js

@@ -236,6 +236,15 @@ describe("GitUtilities", () => {
     });
   });
 
+  describe(".getWorkspaceRoot()", () => {
+    it("calls `git rev-parse --show-toplevel`", () => {
+      ChildProcessUtilities.execSync.mockImplementation(() => "master");
+      const opts = { cwd: "test" };
+      expect(GitUtilities.getWorkspaceRoot(opts)).toBe("master");
+      expect(ChildProcessUtilities.execSync).lastCalledWith("git", ["rev-parse", "--show-toplevel"], opts);
+    });
+  });
+
   describe(".getCurrentBranch()", () => {
     it("calls `git rev-parse --abbrev-ref HEAD`", () => {
       ChildProcessUtilities.execSync.mockImplementation(() => "master");

test/ImportCommand.js

@@ -245,4 +245,33 @@ describe("ImportCommand", () => {
       expect(await pathExists(newFilePath)).toBe(true);
     });
   });
+
+  describe("with non-root Lerna dir", () => {
+    let testDir;
+    let lernaRootDir;
+    let externalDir;
+    let lernaImport;
+
+    beforeEach(async () => {
+      const [extDir, fixtureDir] = await Promise.all([
+        initFixture("ImportCommand/external", "Init external commit"),
+        initFixture("ImportCommand/lerna-not-in-root"),
+      ]);
+
+      externalDir = extDir;
+      testDir = fixtureDir;
+      lernaRootDir = path.join(testDir, "subdir");
+      lernaImport = run(lernaRootDir);
+    });
+
+    // Issue 1197
+    it("creates a module in packages location with imported commit history", async () => {
+      const packageJson = path.join(lernaRootDir, "packages", path.basename(externalDir), "package.json");
+
+      await lernaImport(externalDir);
+
+      expect(await lastCommitInDir(testDir)).toBe("Init external commit");
+      expect(await pathExists(packageJson)).toBe(true);
+    });
+  });
 });

test/fixtures/ImportCommand/lerna-not-in-root/subdir/lerna.json

@@ -0,0 +1,4 @@
+{
+  "lerna": "__TEST_VERSION__",
+  "version": "1.0.0"
+}

test/fixtures/ImportCommand/lerna-not-in-root/subdir/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "independent"
+}