Fix reading with limit and global-revisions

cmd/report.go

@@ -143,8 +143,14 @@ func GetReportCommand() *cobra.Command {
 				}
 
 				if f.IsDir() {
-
 					repo := p
+					if !path.IsAbs(repo) {
+						wd, err := os.Getwd()
+						if err != nil {
+							return fmt.Errorf("get working dir: %v", err)
+						}
+						repo = filepath.Join(wd, repo)
+					}
 					p = args[1]
 					f, err = os.Stat(filepath.Join(repo, p))
 					if err != nil {
@@ -154,7 +160,7 @@ func GetReportCommand() *cobra.Command {
 
 					go listenForUpdates(updateChan, errorChan)
 
-					report, er := runGitHistoryReport(args[0], args[1], latestFlag, updateChan, errorChan, baseFlag,
+					report, er := runGitHistoryReport(repo, p, latestFlag, updateChan, errorChan, baseFlag,
 						remoteFlag, globalRevisionsFlag, limitFlag, limitTimeFlag)
 
 					<-doneChan

git/read_local.go

@@ -132,16 +132,11 @@ func PopulateHistoryWithChanges(commitHistory []*model.Commit, limit int, limitT
 	progressChan chan *model.ProgressUpdate, errorChan chan model.ProgressError, base string, remote bool) ([]*model.Commit, []error) {
 
 	for c := range commitHistory {
-		cmd := exec.Command(GIT, NOPAGER, SHOW, fmt.Sprintf("%s:%s", commitHistory[c].Hash, commitHistory[c].FilePath))
-		var ou, er bytes.Buffer
-		cmd.Stdout = &ou
-		cmd.Stderr = &er
-		cmd.Dir = commitHistory[c].RepoDirectory
-		err := cmd.Run()
+		var err []error
+		commitHistory[c].Data, err = readFile(commitHistory[c].RepoDirectory, commitHistory[c].Hash, commitHistory[c].FilePath)
 		if err != nil {
-			return nil, []error{err}
+			return nil, err
 		}
-		commitHistory[c].Data = ou.Bytes()
 		model.SendProgressUpdate("population",
 			fmt.Sprintf("Extracting %d bytes extracted from commit '%s'",
 				len(commitHistory[c].Data)/1024, commitHistory[c].Hash), false, progressChan)
@@ -220,6 +215,11 @@ func BuildCommitChangelog(commitHistory []*model.Commit,
 		var oldBits, newBits []byte
 		if len(commitHistory) == c+1 {
 			newBits = commitHistory[c].Data
+
+			// Obtain data from the previous commit and fail gracefully, if git
+			// errors. This might happen when the file does not exist in the git
+			// history.
+			oldBits, _ = readFile(commitHistory[c].RepoDirectory, fmt.Sprintf("%s~1", commitHistory[c].Hash), commitHistory[c].FilePath)
 		} else {
 			oldBits = commitHistory[c+1].Data
 			commitHistory[c].OldData = oldBits
@@ -290,3 +290,19 @@ func ExtractPathAndFile(location string) (string, string) {
 	file := path.Base(location)
 	return dir, file
 }
+
+// readFile reads the specified file at the specified commit hash from the
+// specified git repository.
+func readFile(repoDir, hash, filePath string) ([]byte, []error) {
+	cmd := exec.Command(GIT, NOPAGER, SHOW, fmt.Sprintf("%s:%s", hash, filePath))
+	var ou, er bytes.Buffer
+	cmd.Stdout = &ou
+	cmd.Stderr = &er
+	cmd.Dir = repoDir
+	err := cmd.Run()
+	if err != nil {
+		return nil, []error{fmt.Errorf("read file from git: %v", err)}
+	}
+
+	return ou.Bytes(), nil
+}