[Bug] Remote branch not deleted by usethis::pr_finish()

[fh-kpikhart]

When using usethis::pr_finish(), my local branch is deleted, but not the remote branch.

I wonder if there is a bug where the == should be > here:
https://github.com/r-lib/usethis/blob/master/R/pr.R#L350

> usethis::pr_finish()
✔ Switching back to 'master' branch
✔ Pulling changes from GitHub source repo 'origin/master'
✔ Deleting local 'xxx' branch
> 

I don't get the expected output from ui_done(), and the branch is not deleted from GitHub

ui_done("Removing remote {ui_value(remote)}")

[jennybc]

What version of usethis do you have?

If it's not a very recent dev version, can you please install from GitHub and see if you still have the problem?

If so, a more complete reprex is helpful, as it's very hard for functions like this to work with all possible initial states. I would need to see the situation faced by pr_finish(). We use the pr_*() functions heavily internally, but not everyone shares the same workflow.

[fh-kpikhart]

> devtools::session_info() %$% packages
 ! package      * version    date       lib source                                 
   assertthat     0.2.1      2019-03-21 [1] CRAN (R 3.6.1)                         
   backports      1.1.7      2020-05-13 [1] CRAN (R 3.6.1)                         
   bit            1.1-15.2   2020-02-10 [1] CRAN (R 3.6.0)                         
   bit64          0.9-7      2017-05-08 [1] CRAN (R 3.6.0)                         
   blob           1.2.1      2020-01-20 [1] CRAN (R 3.6.0)                         
   callr          3.4.3      2020-03-28 [1] CRAN (R 3.6.2)                         
   cli            2.0.2      2020-02-28 [1] CRAN (R 3.6.0)                         
   clisymbols     1.2.0      2017-05-21 [1] CRAN (R 3.6.1)                         
   commonmark     1.7        2018-12-01 [1] CRAN (R 3.6.1)                         
   crayon         1.3.4      2017-09-16 [1] CRAN (R 3.6.1)                         
   curl           4.0        2019-07-22 [1] CRAN (R 3.6.1)                         
   cyclocomp      1.1.0      2016-09-10 [1] CRAN (R 3.6.0)                         
   DBI            1.1.0      2019-12-15 [1] CRAN (R 3.6.0)                         
   dbplyr         1.4.2      2019-06-17 [1] CRAN (R 3.6.1)                         
   desc           1.2.0      2018-05-01 [1] CRAN (R 3.6.1)                         
   devtools       2.1.0      2019-07-06 [1] CRAN (R 3.6.1)                         
   digest         0.6.25     2020-02-23 [1] CRAN (R 3.6.0)                         
   dplyr          0.8.3      2019-07-04 [1] CRAN (R 3.6.1)                         
   fansi          0.4.1      2020-01-08 [1] CRAN (R 3.6.0)                         
   fs             1.4.1      2020-04-04 [1] CRAN (R 3.6.2)                         
   gh             1.0.1      2017-07-16 [1] CRAN (R 3.6.1)                         
   git2r        * 0.27.1     2020-05-03 [1] CRAN (R 3.6.1)                         
   glue         * 1.3.1      2019-03-12 [1] CRAN (R 3.6.1)                         
   httr           1.4.1      2019-08-05 [1] CRAN (R 3.6.1)                         
   jsonlite       1.6        2018-12-07 [1] CRAN (R 3.6.1)                         
   knitr          1.24       2019-08-08 [1] CRAN (R 3.6.1)                         
   lattice        0.20-38    2018-11-04 [1] CRAN (R 3.6.1)                         
   lazyeval       0.2.2      2019-03-15 [1] CRAN (R 3.6.1)                         
   lintr          2.0.1      2020-02-19 [1] CRAN (R 3.6.0)                         
   magrittr     * 1.5        2014-11-22 [1] CRAN (R 3.6.1)                         
   memoise        1.1.0      2017-04-21 [1] CRAN (R 3.6.1)                         
   pillar         1.4.2      2019-06-29 [1] CRAN (R 3.6.1)                         
   pkgbuild       1.0.5      2019-08-26 [1] CRAN (R 3.6.1)                         
   pkgconfig      2.0.3      2019-09-22 [1] CRAN (R 3.6.0)                         
   pkgload        1.0.2      2018-10-29 [1] CRAN (R 3.6.1)                         
   prettyunits    1.0.2      2015-07-13 [1] CRAN (R 3.6.1)                         
   processx       3.4.2      2020-02-09 [1] CRAN (R 3.6.0)                         
   ps             1.3.3      2020-05-08 [1] CRAN (R 3.6.2)                         
   purrr          0.3.4      2020-04-17 [1] CRAN (R 3.6.2)                         
   R6             2.4.1      2019-11-12 [1] CRAN (R 3.6.0)                         
   Rcpp           1.0.4.6    2020-04-09 [1] CRAN (R 3.6.1)                         
   remotes        2.1.0      2019-06-24 [1] CRAN (R 3.6.1)                         
   rex            1.2.0      2020-04-21 [1] CRAN (R 3.6.2)                         
   rlang          0.4.6      2020-05-02 [1] CRAN (R 3.6.2)                         
   roxygen2       7.0.2      2019-12-02 [1] CRAN (R 3.6.1)                         
   RPostgreSQL    0.6-2      2017-06-24 [1] CRAN (R 3.6.1)                         
   rprojroot      1.3-2      2018-01-03 [1] CRAN (R 3.6.1)                         
   RSQLite        2.2.0      2020-01-07 [1] CRAN (R 3.6.0)                         
   rstudioapi     0.10       2019-03-19 [1] CRAN (R 3.6.1)                         
   x      0.1.0      2020-05-13 [1] local                                  
 P x      * 0.1.3.9000 2020-05-29 [?] Github (flatironhealth/x@154f3eb)
   sessioninfo    1.1.1      2018-11-05 [1] CRAN (R 3.6.1)                         
   stringi        1.4.3      2019-03-12 [1] CRAN (R 3.6.1)                         
   stringr        1.4.0      2019-02-10 [1] CRAN (R 3.6.1)                         
   testthat     * 2.2.1      2019-07-25 [1] CRAN (R 3.6.1)                         
   tibble         2.1.3      2019-06-06 [1] CRAN (R 3.6.1)                         
   tidyselect     1.1.0      2020-05-11 [1] CRAN (R 3.6.2)                         
   usethis      * 1.5.1      2019-07-04 [1] CRAN (R 3.6.1)                         
   utf8           1.1.4      2018-05-24 [1] CRAN (R 3.6.1)                         
   vctrs          0.2.4      2020-03-10 [1] CRAN (R 3.6.1)                         
   withr          2.2.0      2020-04-20 [1] CRAN (R 3.6.2)                         
   xfun           0.13       2020-04-13 [1] CRAN (R 3.6.2)                         
   xml2           1.2.2      2019-08-09 [1] CRAN (R 3.6.1)                         
   xmlparsedata   1.0.3      2019-09-27 [1] CRAN (R 3.6.0)                         
   zoo            1.8-6      2019-05-28 [1] CRAN (R 3.6.1)                         

[1] /Library/Frameworks/R.framework/Versions/3.6/Resources/library

 P ── Loaded and on-disk path mismatch.

My workflow is:

usethis::pr_pull_upstream()
usethis::pr_init("<your_branch_name>")
usethis::pr_push()
usethis::pr_finish()

Example:

kpikhart ~/code/x (master) $ git branch -a | grep "reprex"
kpikhart ~/code/x (master) $

> usethis::pr_pull_upstream()
✔ Pulling changes from GitHub source repo 'origin/master'
> usethis::pr_init("usethis_reprex")
✔ Checking that local branch 'master' has the changes in 'origin/master'
✔ Creating local PR branch 'usethis_reprex'
✔ Switching to branch 'usethis_reprex'
● Use `pr_push()` to create PR

kpikhart ~/code/x (usethis_reprex) $ git branch -a | grep "reprex"
* usethis_reprex

> usethis::pr_push()
✔ Pushing local 'usethis_reprex' branch to 'origin:usethis_reprex'
✔ Setting upstream tracking branch for 'usethis_reprex' to 'origin/usethis_reprex'
✔ Create PR at link given below
✔ Opening URL 'https://github.com/flatironhealth/x/compare/usethis_reprex'

kpikhart ~/code/x (usethis_reprex) $ git branch -a | grep "reprex"
* usethis_reprex
  remotes/origin/usethis_reprex

> usethis::pr_finish()
✔ Switching back to 'master' branch
✔ Pulling changes from GitHub source repo 'origin/master'
✔ Deleting local 'usethis_reprex' branch

kpikhart ~/code/x (usethis_reprex) $ git branch -a | grep "reprex"
  remotes/origin/usethis_reprex

> usethis::pr_pull_upstream()
✔ Pulling changes from GitHub source repo 'origin/master'

kpikhart ~/code/x (master) $ git branch -a | grep "reprex"
  remotes/origin/usethis_reprex

Is == the right comparator to use in that line of code?

[jennybc]

usethis      * 1.5.1      2019-07-04 [1] CRAN (R 3.6.1)

So you are NOT using the dev version of usethis. Quoting from above:

If it's not a very recent dev version, can you please install from GitHub and see if you still have the problem?

You asked "Is == the right comparator to use in that line of code?" Yes I believe so because if there are other still-existing branches associated with that remote, we should not delete the remote. Note there is a difference between a remote and a remote branch.

[fh-kpikhart]

I'm not sure how to identify other branches that are associated with that remote. I just created the dummy remote for the purpose of this reprex, so it seems unlikely that anything else should be associated with it.

I will try the dev version and let you know what I see!

[jennybc]

OK I see what this is about now.

I am usually dealing with PRs as maintainer and/or as a participant in an internal PR. In the case of an internal PR, we typically delete the branch at the time we merge (or close) the PR. In the case of an external PR, I don't generally see that, from the PR contributor's POV, pr_finish() does not delete the branch in their fork.

I can reproduce it.