Changeset View
Changeset View
Standalone View
Standalone View
src/land/ArcanistGitLandEngine.php
| Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Lines | try { | ||||
| throw new Exception( | throw new Exception( | ||||
| pht( | pht( | ||||
| 'Local "%s" does not merge cleanly into "%s". Merge or rebase '. | 'Local "%s" does not merge cleanly into "%s". Merge or rebase '. | ||||
| 'local changes so they can merge cleanly.', | 'local changes so they can merge cleanly.', | ||||
| $this->getSourceRef(), | $this->getSourceRef(), | ||||
| $this->getTargetFullRef())); | $this->getTargetFullRef())); | ||||
| } | } | ||||
| list($changes) = $api->execxLocal('diff HEAD --'); | // TODO: This could probably be cleaner by asking the API a question | ||||
| // about working copy status instead of running a raw diff command. See | |||||
| // discussion in T11435. | |||||
| list($changes) = $api->execxLocal('diff --no-ext-diff HEAD --'); | |||||
| $changes = trim($changes); | $changes = trim($changes); | ||||
| if (!strlen($changes)) { | if (!strlen($changes)) { | ||||
| throw new Exception( | throw new Exception( | ||||
| pht( | pht( | ||||
| 'Merging local "%s" into "%s" produces an empty diff. '. | 'Merging local "%s" into "%s" produces an empty diff. '. | ||||
| 'This usually means these changes have already landed.', | 'This usually means these changes have already landed.', | ||||
| $this->getSourceRef(), | $this->getSourceRef(), | ||||
| $this->getTargetFullRef())); | $this->getTargetFullRef())); | ||||
| ▲ Show 20 Lines • Show All 400 Lines • Show Last 20 Lines | |||||