From bcc1056a1fdd10cb27f25254cb9bf017b46d5afe Mon Sep 17 00:00:00 2001
From: John Blischak <jdblischak@gmail.com>
Date: Mon, 29 May 2017 14:44:35 -0500
Subject: [PATCH] Enable argument 'all' to commit multiple modified (or
 deleted) files.

Signed-off-by: John Blischak <jdblischak@gmail.com>
---
 R/commit.r     | 19 ++++++++-------
 tests/commit.R | 64 +++++++++++++++++++++++++++++++++++---------------
 2 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/R/commit.r b/R/commit.r
index 12d1807cf..b0da240d1 100644
--- a/R/commit.r
+++ b/R/commit.r
@@ -151,15 +151,18 @@ setMethod("commit",
                               untracked = FALSE,
                               ignored   = FALSE)
 
-                  ## Stage modified files
-                  lapply(s$unstaged$modified, function(x) {
-                      add(repo, x)
-                  })
+                  # Convert list of lists to character vector
+                  unstaged <- unlist(s$unstaged)
+                  for (i in seq_along(unstaged)) {
+                    if (names(unstaged)[i] == "modified") {
+                      ## Stage modified files
+                      add(repo, unstaged[i])
+                    } else if (names(unstaged)[i] == "deleted") {
+                      ## Stage deleted files
+                      .Call(git2r_index_remove_bypath, repo, unstaged[i])
+                    }
+                  }
 
-                  ## Stage deleted files
-                  lapply(s$unstaged$deleted, function(x) {
-                      .Call(git2r_index_remove_bypath, repo, x)
-                  })
               }
 
               if (session)
diff --git a/tests/commit.R b/tests/commit.R
index 0d3f483ae..135a6bed8 100644
--- a/tests/commit.R
+++ b/tests/commit.R
@@ -81,43 +81,69 @@ writeLines(c("Hello world!", "HELLO WORLD!", "HeLlO wOrLd!"),
            file.path(path, "test.txt"))
 commit(repo, "Commit message 3", all = TRUE)
 
-stopifnot(identical(status(repo),
-                    structure(list(
-                        staged = structure(list(), .Names = character(0)),
-                        unstaged = structure(list(), .Names = character(0)),
-                        untracked = structure(list(), .Names = character(0))),
-                              .Names = c("staged", "unstaged", "untracked"),
-                              class = "git_status")))
+status_clean <- structure(list(
+  staged = structure(list(), .Names = character(0)),
+  unstaged = structure(list(), .Names = character(0)),
+  untracked = structure(list(), .Names = character(0))),
+  .Names = c("staged", "unstaged", "untracked"),
+  class = "git_status")
+stopifnot(identical(status(repo), status_clean))
 
 ## Delete file and commit with 'all' argument
 file.remove(file.path(path, "test.txt"))
 commit(repo, "Commit message 4", all = TRUE)
 
-stopifnot(identical(status(repo),
-                    structure(list(
-                        staged = structure(list(), .Names = character(0)),
-                        unstaged = structure(list(), .Names = character(0)),
-                        untracked = structure(list(), .Names = character(0))),
-                              .Names = c("staged", "unstaged", "untracked"),
-                              class = "git_status")))
+stopifnot(identical(status(repo), status_clean))
+
+## Add and commit multiple tracked files with 'all' argument
+writeLines(sample(letters, 3), file.path(path, "test2.txt"))
+add(repo, "test2.txt")
+writeLines(sample(letters, 3), file.path(path, "test3.txt"))
+add(repo, "test3.txt")
+writeLines(sample(letters, 3), file.path(path, "test4.txt"))
+add(repo, "test4.txt")
+commit(repo, "Commit message 5")
+
+stopifnot(identical(status(repo), status_clean))
+
+writeLines(sample(letters, 3), file.path(path, "test2.txt"))
+writeLines(sample(letters, 3), file.path(path, "test3.txt"))
+writeLines(sample(letters, 3), file.path(path, "test4.txt"))
+commit(repo, "Commit message 6", all = TRUE)
+
+stopifnot(identical(status(repo), status_clean))
+
+## Add one tracked file and delete another with 'all' argument
+writeLines(sample(letters, 3), file.path(path, "test2.txt"))
+file.remove(file.path(path, "test4.txt"))
+commit(repo, "Commit message 7", all = TRUE)
+
+stopifnot(identical(status(repo), status_clean))
+
+## Delete multiple tracked files with 'all' argument
+file.remove(file.path(path, "test2.txt"))
+file.remove(file.path(path, "test3.txt"))
+commit(repo, "Commit message 8", all = TRUE)
+
+stopifnot(identical(status(repo), status_clean))
 
 ## Check max number of commits in output
-stopifnot(identical(length(commits(repo)), 4L))
-stopifnot(identical(length(commits(repo, n = -1)), 4L))
+stopifnot(identical(length(commits(repo)), 8L))
+stopifnot(identical(length(commits(repo, n = -1)), 8L))
 stopifnot(identical(length(commits(repo, n = 2)), 2L))
 tools::assertError(commits(repo, n = 2.2))
 tools::assertError(commits(repo, n = "2"))
 
 ## Check to coerce repository to data.frame
 df <- as(repo, "data.frame")
-stopifnot(identical(dim(df), c(4L, 6L)))
+stopifnot(identical(dim(df), c(8L, 6L)))
 stopifnot(identical(names(df), c("sha", "summary", "message",
                                  "author", "email", "when")))
 
 ## Set working directory to path and check commits
 setwd(path)
-stopifnot(identical(length(commits()), 4L))
-stopifnot(identical(length(commits(n = -1)), 4L))
+stopifnot(identical(length(commits()), 8L))
+stopifnot(identical(length(commits(n = -1)), 8L))
 stopifnot(identical(length(commits(n = 2)), 2L))
 tools::assertError(commits(n = 2.2))
 tools::assertError(commits(n = "2"))