Page MenuHomePhabricator
Create Task
Maniphest T4291

arc land does not stop when local is ahead of remote when using git
Closed, ResolvedPublic
Actions

Description

When using git as the VCS, if I committed something on my local onto branch (master) and then switch to a review branch and run arc land. Both changes will be pushed to the remote.

When I looked at ArcanistLandWorkflow.php it looks like the only case we will set $local_ahead_of_remote is when git pull --ff-only --no-stat fails and it is a git/svn repo. Both conditions do not apply in this case.

More than that, using git pull assumes that the onto branch is setup to correctly track the remote onto branch which is not always the case.

Revisions and Commits

rARC Arcanist
D8738rARC02456c0aed60 Arcanist - stop arc land if local is ahead of remote

Event Timeline

• noyeitan2 created this task.Jan 8 2014, 2:51 PM
• noyeitan2 assigned this task to epriestley.
• noyeitan2 raised the priority of this task from to Normal.
• noyeitan2 updated the task description. (Show Details)
• noyeitan2 added a project: Arcanist.
• noyeitan2 added a subscriber: • noyeitan2.
epriestley added a comment.Jan 8 2014, 4:54 PM

Yeah, this is silly and we should definitely detect it. I think I assumed that the git pull would fail when I wrote it originally, but was mistaken in this case.

epriestley reassigned this task from epriestley to btrahan.Apr 9 2014, 12:35 AM
epriestley added a subscriber: epriestley.

In arc land, we should do this sort of logic after a successful pull, not just after a failed pull under git-svn:

list($out) = $repository_api->execxLocal(
  'log %s..%s',
  $this->ontoRemoteBranch,
  $this->onto);
if (strlen(trim($out))) {
  $local_ahead_of_remote = true;
}

Also, all of the user-facing strings in this file should be using pht() if you're feeling brave.

btrahan edited this Maniphest Task.Apr 9 2014, 7:30 PM
btrahan edited this Maniphest Task.Apr 9 2014, 7:35 PM
btrahan closed this task as Resolved.Apr 9 2014, 7:35 PM

Closed by commit rARC02456c0aed60.

Phabricator · Built by Phacility