Changeset View
Changeset View
Standalone View
Standalone View
src/workflow/ArcanistLandWorkflow.php
| Show First 20 Lines • Show All 880 Lines • ▼ Show 20 Lines | if ($this->isGit) { | ||||
| "'%s' again.", | "'%s' again.", | ||||
| $this->onto, | $this->onto, | ||||
| $this->onto, | $this->onto, | ||||
| $divergedbookmark, | $divergedbookmark, | ||||
| 'arc land'))); | 'arc land'))); | ||||
| } | } | ||||
| } catch (CommandException $ex) { | } catch (CommandException $ex) { | ||||
| $err = $ex->getError(); | $err = $ex->getError(); | ||||
| $stdout = $ex->getStdOut(); | $stdout = $ex->getStdout(); | ||||
| // Copied from: PhabricatorRepositoryPullLocalDaemon.php | // Copied from: PhabricatorRepositoryPullLocalDaemon.php | ||||
| // NOTE: Between versions 2.1 and 2.1.1, Mercurial changed the | // NOTE: Between versions 2.1 and 2.1.1, Mercurial changed the | ||||
| // behavior of "hg pull" to return 1 in case of a successful pull | // behavior of "hg pull" to return 1 in case of a successful pull | ||||
| // with no changes. This behavior has been reverted, but users who | // with no changes. This behavior has been reverted, but users who | ||||
| // updated between Feb 1, 2012 and Mar 1, 2012 will have the | // updated between Feb 1, 2012 and Mar 1, 2012 will have the | ||||
| // erroring version. Do a dumb test against stdout to check for this | // erroring version. Do a dumb test against stdout to check for this | ||||
| // possibility. | // possibility. | ||||
| ▲ Show 20 Lines • Show All 672 Lines • Show Last 20 Lines | |||||