feat: Pull as part of finalize_version()

R/api-commit-version.R

@@ -3,11 +3,14 @@
 #' Commits changes to `NEWS.md` and `DESCRIPTION`, amending a previous commit
 #' created by \pkg{fledge} if necessary.
 #'
+#' @param pull whether to fetch the remote (if it exists).
+#'
+#'
 #' @example man/examples/commit-version.R
 #'
 #' @export
-commit_version <- function() {
-  amending <- commit_version_impl()
+commit_version <- function(pull = TRUE) {
+  amending <- commit_version_impl(pull = pull)
 
   #' @return Invisibly: `TRUE` if a previous commit for that version has been
   #'   amended, `FALSE` if not.

R/api-finalize-version.R

@@ -4,9 +4,10 @@
 #' Calls the following functions:
 #'
 #' @param push If `TRUE`, push the created tag.
+#' @inheritParams commit_version
 #' @example man/examples/finalize-version.R
 #' @return None
 #' @export
-finalize_version <- function(push = FALSE) {
-  with_repo(finalize_version_impl(push, suggest_finalize = FALSE))
+finalize_version <- function(push = FALSE, pull = push) {
+  with_repo(finalize_version_impl(push, suggest_finalize = FALSE, pull))
 }

R/commit-version.R

@@ -1,4 +1,4 @@
-commit_version_impl <- function() {
+commit_version_impl <- function(pull) {
   check_only_staged(c("DESCRIPTION", news_path()))
 
   if (is_last_commit_bump()) {

R/finalize-version.R

@@ -1,12 +1,20 @@
 #' @rdname finalize_version
 #' @usage NULL
-finalize_version_impl <- function(push, suggest_finalize = TRUE) {
+finalize_version_impl <- function(push, suggest_finalize = TRUE, pull) {
   #' @description
   #' 1. [commit_version()]
   force <- commit_version()
   #' 1. [tag_version()], setting `force = TRUE` if and only if `commit_version()`
   #'   amended a commit.
   tag <- tag_version(force)
+  #' 1. git pull with rebase if `pull = TRUE`.
+  if (has_remote_branch(gert::git_branch()) && pull) {
+    # is the local branch behind?
+    if (gert::git_ahead_behind()$behind > 0) {
+      # With pull = TRUE we would fetch always and always uncommit + commit if behind master
+      gert::git_pull(rebase = TRUE)
+    }
+  }
   #' 1. Force-pushes the created tag to the `"origin"` remote, if `push = TRUE`.
   if (push) {
     push_tag(tag, force = TRUE)

tests/testthat/_snaps/bump_version.md

@@ -1,28 +1,5 @@
 # bump_version() works -- dev
 
-    Code
-      bump_version()
-    Message
-      > Digesting messages from 3 commits.
-      v Found 1 NEWS-worthy entry.
-
-      -- Updating NEWS --
-
-      > Adding new entries to 'NEWS.md'.
-
-      -- Updating Version --
-
-      v Package version bumped to 0.0.0.9001.
-      > Added header to 'NEWS.md'.
-      > Committing changes.
-
-      -- Tagging Version --
-
-      > Creating tag v0.0.0.9001 with tag message derived from 'NEWS.md'.
-      ! Call `fledge::finalize_version(push = TRUE)`.
-
----
-
     x No change since last version.
     i Use `no_change_behavior = "bump"` to force a version bump, or `no_change_behavior = "noop"` to do nothing.
 
@@ -33,28 +10,17 @@
     Message
       i No change since last version.
 
+---
+
+    x No change since last version.
+    i Use `no_change_behavior = "bump"` to force a version bump, or `no_change_behavior = "noop"` to do nothing.
+
 ---
 
     Code
-      bump_version(no_change_behavior = "bump")
+      bump_version(no_change_behavior = "noop")
     Message
-      > Digesting messages from 1 commits.
-      i Same as previous version.
-
-      -- Updating NEWS --
-
-      > Adding new entries to 'NEWS.md'.
-
-      -- Updating Version --
-
-      v Package version bumped to 0.0.0.9002.
-      > Added header to 'NEWS.md'.
-      > Committing changes.
-
-      -- Tagging Version --
-
-      > Creating tag v0.0.0.9002 with tag message derived from 'NEWS.md'.
-      ! Call `fledge::finalize_version(push = TRUE)`.
+      i No change since last version.
 
 # bump_version() works -- not dev