svn: /web/php-rmtools/trunk/client/include/ Branch.php

pajoye Wed, 27 Apr 2011 12:03:33 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=310553 Log: - don't overwrite prev rev when no new rev exists Changed paths: U web/php-rmtools/trunk/client/include/Branch.php Modified: web/php-rmtools/trunk/client/include/Branch.php =================================================================== --- web/php-rmtools/trunk/client/include/Branch.php 2011-04-27 10:37:06 UTC (rev 310552) +++ web/php-rmtools/trunk/client/include/Branch.php 2011-04-27 12:03:33 UTC (rev 310553) @@ -50,10 +50,13 @@ public function update() { - $this->data->revision_previous = $this->data->revision_last; - $this->data->revision_last = $this->repo->getLastCommitId(); - $json = json_encode($this->data); - file_put_contents($this->db_path, $json); + $last_id = $this->repo->getLastCommitId(); + if ($last_id != $this->data->revision_previous) { + $this->data->revision_previous = $this->data->revision_last; + $this->data->revision_last = $last_id; + $json = json_encode($this->data); + file_put_contents($this->db_path, $json); + } } public function hasNewRevision() @@ -102,7 +105,7 @@ public function getPreviousRevision() { if (!$this->data->revision_previous) { - $this->update(); + return NULL; } return $this->data->revision_previous; }