Details

Reviewers

epriestley

Group Reviewers

Blessed Reviewers

Maniphest Tasks

T5690: Respect tracked branches in arc land

Commits

rARCbb6d11b73222: Use GIT tracked branches for arc land targets when reasonable

Summary

See T5690.
-arc land now respects tracked branch when choosing 'onto'; '--onto' option remains as an override.
-arc land now respects tracked branch when choosing a remote; the remote is taken from 'onto's upstream unless the '--remote' option is present; when 'onto' branch has no upstream the '--remote' option must be provided as before.

Since 'arc feature' branches are (already) created as tracking branches, 'arc.land.onto.default' if present, is only used as the default when a non-tracking branch created by some other means is landed with out explicit '--onto'. This may be surprising but is probably the correct go-forward behavior and is inline with the description in T5690.

Test Plan

-checked having no arc.land.onto.default still assumes 'master'
-checked 'arc.land.onto.default' still overrides 'master'
-checked upstream branch (of feature branch) overrides 'master' and 'arc.land.onto.default'
-checked '--onto' overrides all
-checked origin is default for non-tracking branches
-checked the land onto branch's upstream remote is used instead of 'origin'
-checked '--remote' overrides 'origin' and the tracked upstream
-tested several crazy branch names including 'something/like/this' for both the upstream and tracking branches
-tested on linux and OS X
-rinse and repeat on Windows

Diff Detail

Repository

rARC Arcanist

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

bttelle updated this revision to Diff 24183.Jul 26 2014, 4:16 AM

bttelle retitled this revision from to Use GIT tracked branches for arc land targets when reasonable.

bttelle updated this object.

bttelle edited the test plan for this revision. (Show Details)

bttelle added a reviewer: epriestley.

Herald added a reviewer: Blessed Reviewers. · View Herald TranscriptJul 26 2014, 4:16 AM

Herald added subscribers: Korvin, epriestley. · View Herald Transcript

Harbormaster completed remote builds in B1904: Diff 24183.Jul 26 2014, 4:17 AM

bttelle added a task: T5690: Respect tracked branches in arc land.Jul 26 2014, 4:24 AM

Added --no-color to the git branch --list commands

Harbormaster completed remote builds in B1905: Diff 24184.Jul 26 2014, 4:42 AM

I'll bullet-proof the matching a bit more if the overall approach looks ok. Let me know if I'm on the right track. I tested about half of the test plan so far.

src/workflow/ArcanistLandWorkflow.php
247	this regex needs to be tightened up; right now it is incorrect for this oddball case: master 76d80fa [master] Rename blah [1/50] i.e., master has no upstream set and commit message looks like a tracking branch

bttelle added inline comments.Jul 26 2014, 5:29 AM

src/workflow/ArcanistLandWorkflow.php
258	actually it's this regex that applies to above comment; sorry I'm a noob with the tools

Oh, I think you can figure out the tracked name more easily with:

$ git rev-parse --symbolic-full-name master@{upstream}

...where master is the name of the branch you want to learn the upstream for. The flag --abbrev-ref might also be helpful, but I think it might introduce ambiguity for branches which contain slashes in their names. This approach otherwise looks generally correct, but I think using rev-parse can simplify it a lot. Let me know if there's a reason that doesn't work and maybe I can come up with another approach.

I had a feeling you would show me a much better approach than my -v/-vv hack. Thanks for the feedback. I'll resubmit after testing with rev-parse. It looks like it will work fine.

uses rev-parse for discovering upstreams; simpler, handles branches with slashes

Harbormaster completed remote builds in B1908: Diff 24189.Jul 27 2014, 12:34 AM

tweaked regex for matching remotes

Harbormaster completed remote builds in B1909: Diff 24190.Jul 27 2014, 4:30 AM

Use GIT tracked branches for arc land targets when reasonable
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 24209

src/workflow/ArcanistLandWorkflow.php

Use GIT tracked branches for arc land targets when reasonableClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 24209

src/workflow/ArcanistLandWorkflow.php

Use GIT tracked branches for arc land targets when reasonable
ClosedPublic
Actions

Revision Contents
Changeset List