$files = '';
if (!empty($_POST['files'])) {
+
+
// if we select all the files, we should do a merge, rather than a commit..
- $files = json_decode($_POST['files']);
+ $files = $_POST['files'] == '_all_' ? '_all_' : json_decode($_POST['files']);
}
- $fh = $this->repo->impl()->git('diff', "{$this->release}..{$rev}", '--', $files);
- $of = fopen($patchfile, 'w');
- stream_copy_to_stream($fh, $of);
- fclose($of); fclose($fh);
- //var_dump($patch);
- $patch = System::which('patch');
- chdir($wd->dir);
- $cmd = "$patch -p1 < " . $patchfile;
- `$cmd`; //eg . patch -p1 < /var/lib/php5/MTrackTMPgZFeAN.txt
- echo $cmd;
+
+ if (is_array($files)) {
+
+ $fh = $this->repo->impl()->git('diff', "{$this->release}..{$rev}", '--', $files);
+ $of = fopen($patchfile, 'w');
+ stream_copy_to_stream($fh, $of);
+ fclose($of); fclose($fh);
+ //var_dump($patch);
+ $patch = System::which('patch');
+ chdir($wd->dir);
+ $cmd = "$patch -p1 < " . $patchfile;
+ `$cmd`; //eg . patch -p1 < /var/lib/php5/MTrackTMPgZFeAN.txt
+ } else {
+ $wd->git('merge', '--squash' , $rev);
+ }
+
+ //echo $cmd;
$commit = (object) array(
'when' => $mi[0]->ctime,
);
$res = $wd->commit($commit);
+ if (!is_array($files)) {
+ // we do an actually merge commit seperatly from the merge diff, so that
+ // our logs show a nice history in each of those commits.
+ // not sure if this is a good idea or not..
+ $wd->git('merge', '-m', "Merge Commit with working branch (no code changed)" , $rev);
+ }
+
+
$res .= $wd->push();
$this->jok($res);