aboutsummaryrefslogtreecommitdiffstats
path: root/library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-01 22:29:51 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-01 22:29:51 -0400
commitc2d15e6c3bd8a29bae89d184a999ddac15fcb807 (patch)
tree96cbbfa98f131d830fbfd154f82e37383bb37bd8 /library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php
parentb1ae4d776c7c093c7f3ff6905e1a5302fbd5e3f6 (diff)
downloadvolse-hubzilla-c2d15e6c3bd8a29bae89d184a999ddac15fcb807.tar.gz
volse-hubzilla-c2d15e6c3bd8a29bae89d184a999ddac15fcb807.tar.bz2
volse-hubzilla-c2d15e6c3bd8a29bae89d184a999ddac15fcb807.zip
New plugin repo is cloned to /store/pluginrepos/REPONAME for analysis
Diffstat (limited to 'library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php')
-rw-r--r--library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php129
1 files changed, 129 insertions, 0 deletions
diff --git a/library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php b/library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php
new file mode 100644
index 000000000..7516b360c
--- /dev/null
+++ b/library/kzykhys/git/src/PHPGit/Command/RebaseCommand.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace PHPGit\Command;
+
+use PHPGit\Command;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * Forward-port local commits to the updated upstream head - `git rebase`
+ *
+ * @author Kazuyuki Hayashi <hayashi@valnur.net>
+ */
+class RebaseCommand extends Command
+{
+
+ /**
+ * Forward-port local commits to the updated upstream head
+ *
+ * ``` php
+ * $git = new PHPGit\Git();
+ * $git->setRepository('/path/to/repo');
+ * $git->fetch('origin');
+ * $git->rebase('origin/master');
+ * ```
+ *
+ * ##### Options
+ *
+ * - **onto** (_string_) Starting point at which to create the new commits
+ * - **no-verify** (_boolean_) Bypasses the pre-rebase hook
+ * - **force-rebase** (_boolean_) Force the rebase even if the current branch is a descendant of the commit you are rebasing onto
+ *
+ * @param string $upstream [optional] Upstream branch to compare against
+ * @param string $branch [optional] Working branch; defaults to HEAD
+ * @param array $options [optional] An array of options {@see RebaseCommand::setDefaultOptions}
+ *
+ * @return bool
+ */
+ public function __invoke($upstream = null, $branch = null, array $options = array())
+ {
+ $options = $this->resolve($options);
+ $builder = $this->git->getProcessBuilder()
+ ->add('rebase');
+
+ if ($options['onto']) {
+ $builder->add('--onto')->add($options['onto']);
+ }
+
+ if ($upstream) {
+ $builder->add($upstream);
+ }
+
+ if ($branch) {
+ $builder->add($branch);
+ }
+
+ $this->git->run($builder->getProcess());
+
+ return true;
+ }
+
+ /**
+ * Restart the rebasing process after having resolved a merge conflict
+ *
+ * @return bool
+ */
+ public function continues()
+ {
+ $builder = $this->git->getProcessBuilder()
+ ->add('rebase')
+ ->add('--continue');
+
+ $this->git->run($builder->getProcess());
+
+ return true;
+ }
+
+ /**
+ * Abort the rebase operation and reset HEAD to the original branch
+ *
+ * @return bool
+ */
+ public function abort()
+ {
+ $builder = $this->git->getProcessBuilder()
+ ->add('rebase')
+ ->add('--abort');
+
+ $this->git->run($builder->getProcess());
+
+ return true;
+ }
+
+ /**
+ * Restart the rebasing process by skipping the current patch
+ *
+ * @return bool
+ */
+ public function skip()
+ {
+ $builder = $this->git->getProcessBuilder()
+ ->add('rebase')
+ ->add('--skip');
+
+ $this->git->run($builder->getProcess());
+
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ *
+ * - **onto** (_string_) Starting point at which to create the new commits
+ * - **no-verify** (_boolean_) Bypasses the pre-rebase hook
+ * - **force-rebase** (_boolean_) Force the rebase even if the current branch is a descendant of the commit you are rebasing onto
+ */
+ public function setDefaultOptions(OptionsResolverInterface $resolver)
+ {
+ $resolver->setDefaults(array(
+ 'onto' => null,
+ 'no-verify' => false,
+ 'force-rebase' => false
+ ));
+
+ $resolver->setAllowedTypes(array(
+ 'onto' => array('null', 'string')
+ ));
+ }
+
+} \ No newline at end of file