Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update git2r package #3

Merged
merged 3 commits into from
Jun 22, 2022
Merged

Update git2r package #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67b9feb
update git2r package to >= 0.30.1
EngineerDanny Jun 22, 2022
108916f
update head repo function of git2r
EngineerDanny Jun 22, 2022
c493c74
fix S3 object compatibility bug
EngineerDanny Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Description: Rperform helps R package developers keep track of the quantitative
metrics of their packages over various development versions.
BugReports: https://github.com/analyticalmonk/Rperform/issues
Imports:
git2r (<= 0.21.0),
git2r (>= 0.30.1),
ggplot2 (>= 1.0.1),
testthat (>= 0.10.0),
devtools (>= 1.8.0),
Expand Down
8 changes: 4 additions & 4 deletions R/branch_metrics.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ time_branch <- function(test_path, branch = "master", num_commits = 5) {

# Git operations
target <- git2r::repository("./")
origin_state <- git2r::head(target)
origin_state <- git2r::repository_head(target)
git2r::checkout(target, branch)
on.exit(expr = git2r::checkout(origin_state))

Expand Down Expand Up @@ -194,7 +194,7 @@ compare_branchm <- function(test_path, branch1, branch2 = "master") {
stopifnot(length(branch2) == 1)

target <- git2r::repository("./")
original_state <- git2r::head(target)
original_state <- git2r::repository_head(target)
same_commit <- .common_commit(branch1 = branch1, branch2 = branch2)
# same_commit
# ---------------------------------------------
Expand Down Expand Up @@ -239,7 +239,7 @@ compare_branchm <- function(test_path, branch1, branch2 = "master") {
target1 <- git2r::repository(file.path("./"))
# If branch1 is specified, check out to it and obtain commit list
if (!is.null(branch1)) {
original_state1 <- git2r::head(target1)
original_state1 <- git2r::repository_head(target1)
git2r::checkout(object = target1, branch = branch1)
}
commitlist1 <- git2r::commits(target1)
Expand All @@ -256,7 +256,7 @@ compare_branchm <- function(test_path, branch1, branch2 = "master") {
target2 <- git2r::repository(file.path("./"))
# If branch2 is specified, check out to it and obtain commit list
if (!is.null(branch2)) {
original_state2 <- git2r::head(target2)
original_state2 <- git2r::repository_head(target2)
git2r::checkout(object = target2, branch = branch2)
}
commitlist2 <- git2r::commits(target2)
Expand Down
9 changes: 5 additions & 4 deletions R/git_help.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
get_sha <- function(commit_val) {
stopifnot(git2r::is_commit(commit_val))

attr(commit_val, which = "sha")
commit_val$sha
}

## -----------------------------------------------------------------------------------------
Expand All @@ -29,7 +29,7 @@ get_sha <- function(commit_val) {
get_datetime <- function(commit_val) {
stopifnot(git2r::is_commit(commit_val))

methods::as((commit_val@committer@when), "POSIXct")
as.POSIXct(git2r::when(commit_val$author$when))
}

## -----------------------------------------------------------------------------------------
Expand All @@ -49,7 +49,7 @@ get_datetime <- function(commit_val) {
get_msg <- function(commit_val) {
stopifnot(git2r::is_commit(commit_val))

base::substr(commit_val@summary, start = 1, stop = 15)
base::substr(commit_val[[4]], start = 1, stop = 15)
EngineerDanny marked this conversation as resolved.
Show resolved Hide resolved
}

## -----------------------------------------------------------------------------------------
Expand All @@ -65,7 +65,8 @@ get_msg <- function(commit_val) {

get_branch <- function(dir_path = "./") {
repo <- git2r::repository(dir_path)
git2r::head(repo)@name
head <- git2r::repository_head(repo)
head[[1]]
}

## -----------------------------------------------------------------------------------------
8 changes: 3 additions & 5 deletions R/plot_metrics.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ utils::globalVariables(c("metric_val", "test_name"))
#'

plot_metrics <- function(test_path, metric, num_commits = 5, save_data = FALSE, save_plots = FALSE,
interactive = FALSE) {
interactive = FALSE){
stopifnot(is.character(test_path))
stopifnot(length(test_path) == 1)
stopifnot(is.character(metric))
Expand All @@ -75,12 +75,12 @@ plot_metrics <- function(test_path, metric, num_commits = 5, save_data = FALSE,
stopifnot(is.logical(save_plots))
stopifnot(length(save_plots) == 1)
floor(num_commits)

if (metric == "time") {
if (interactive) {
temp_out <- capture.output(.plot_interactive_time(test_path, num_commits, save_data, save_plots))
} else {
temp_out <- capture.output(.plot_time(test_path, num_commits, save_data, save_plots))
temp_out <- capture.output(.plot_time(test_path, num_commits, save_data, save_plots))
}
}
else if (metric == "memory") {
Expand Down Expand Up @@ -221,10 +221,8 @@ plot_metrics <- function(test_path, metric, num_commits = 5, save_data = FALSE,


.plot_time <- function(test_path, num_commits, save_data, save_plots) {

# Obtain the metrics data
suppressMessages(time_data <- time_compare(test_path, num_commits))

# Store the metrics data if save_data is TRUE
if (save_data){

Expand Down
13 changes: 7 additions & 6 deletions R/repo_metrics.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,10 @@ list_commits <- function(path = "./", num_commits = 20){
date_list <- list()

for (i in 1:num_commits) {
com <- attr(commit_list[[i]], which = "sha")
msg <- attr(commit_list[[i]], which = "summary")
com_date <- as(commit_list[[i]]@committer@when, "character")
com <- commit_list[[i]]$sha
msg <- commit_list[[i]]$summary
com_date <- commit_list[[i]]$author$when

sha_list[i] <- com
msg_list[i] <- msg
date_list[i] <- com_date
Expand Down Expand Up @@ -152,7 +153,7 @@ time_commit <- function(test_path, test_commit) {
target <- git2r::repository("./")
# Reverting to the current branch on exit from the function
######################################################################
original_state <- git2r::head(target)
original_state <- git2r::repository_head(target)
git2r::checkout(test_commit)
on.exit(expr = git2r::checkout(original_state))
######################################################################
Expand Down Expand Up @@ -229,7 +230,7 @@ time_commit <- function(test_path, test_commit) {

time_df <- data.frame(test_name, metric_name = "runtime (in seconds)", status,
metric_val = seconds, message = msg_val,
sha = sha_val, date_time = commit_dtime)
sha = sha_val, date_time = commit_dtime)
test_results[[test_name]] <<- time_df
}

Expand Down Expand Up @@ -415,7 +416,7 @@ mem_commit <- function(test_path, test_commit) {

## Git operations
target <- git2r::repository("./")
original_state <- git2r::head(target)
original_state <- git2r::repository_head(target)
git2r::checkout(test_commit)
on.exit(expr = git2r::checkout(original_state))
test_results <- list()
Expand Down