Fix arc land on odd/modern git-svn checkouts
ClosedPublic
Actions

Authored by asherkin on Sep 17 2018, 2:42 PM.

Details

Reviewers

epriestley

Group Reviewers

Blessed Reviewers

Maniphest Tasks

T13293: `arc land` using git-svn fails in certain configurations

Commits

rARC7329bc7c32b9: Fix arc land on odd/modern git-svn checkouts

Summary

The current code assumes git-svn is always working from a remote called
trunk, but if the repository is initialized without the -T option it
will instead be called git-svn, and if --prefix is used (which is
set by default to origin/ in Git 2+) the remote name will have the
specified prefix as well.

Instead, look at the fetch target refspec set in the git-svn config.

Fixes T13293.

Test Plan

arc land without errors (or manually creating a trunk branch) from a
checkout made with Git 2.18.0 (verified this manually on a non--T
checkout as well).

Diff Detail

Repository

rARC Arcanist

Branch

git-svn-modern (branched from master)

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 20843
Build 28350: Run Core Tests
Build 28349: arc lint + arc unit

Event Timeline

asherkin created this revision.Sep 17 2018, 2:42 PM

Herald added a reviewer: Blessed Reviewers. · View Herald TranscriptSep 17 2018, 2:42 PM

Harbormaster completed remote builds in B20843: Diff 47032.Sep 17 2018, 2:42 PM

asherkin requested review of this revision.Sep 17 2018, 2:42 PM

Herald added a subscriber: Korvin. · View Herald TranscriptSep 17 2018, 2:42 PM

Can you file a task for this that has step-by-step reproduction instructions (e.g., run this command, then run this command, here's where the thing breaks before this change)? I think this change is likely fine, I'm just not confident I'll be able to reproduce the issue when this refactors during T13098.

This revision now requires changes to proceed.May 14 2019, 2:24 PM

asherkin mentioned this in T13293: `arc land` using git-svn fails in certain configurations.May 20 2019, 11:56 AM

asherkin edited the summary of this revision. (Show Details)

asherkin added a task: T13293: `arc land` using git-svn fails in certain configurations.

asherkin added inline comments.May 20 2019, 2:15 PM

src/workflow/ArcanistLandWorkflow.php
319–320	Re-visiting this after the testing today, I'm not 100% confident this is actually going to behave correctly with multiple git-svn remotes or tracking branches, but neither are something I've ever used with it.