← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_hashcache.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-02 13:07:14 UTC
  • mto: (4524.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4525.
  • Revision ID: v.ladeuil+lp@free.fr-20090702130714-hsyqfusi8vn3a11m
Use tree.has_changes() where appropriate (the test suite caught a
bug in has_changes() (not filtering out the root) in an impressive
number of tests)

* bzrlib/send.py:
(send): Use tree.has_changes() instead of tree.changes_from().

* bzrlib/reconfigure.py:
(Reconfigure._check): Use tree.has_changes() instead of
tree.changes_from().

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.compare_basis): Use
tree.has_changes() instead of tree.changes_from().

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use
tree.has_changes() instead of tree.changes_from().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_hashcache.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
import stat
146
146
                10, 20,
147
147
                stat.S_IFREG | 0600)
148
148
 
149
 
    def _really_sha1_file(self, abspath):
 
149
    def _really_sha1_file(self, abspath, filters):
150
150
        if abspath in self._files:
151
151
            return sha1(self._files[abspath][0])
152
152
        else:
158
158
    def pretend_to_sleep(self, secs):
159
159
        self._clock += secs
160
160
 
161
 
    
 
161
 
162
162
class TestHashCacheFakeFilesystem(TestCaseInTempDir):
163
163
    """Tests the hashcache using a simulated OS.
164
164
    """
173
173
        self.assertEquals(hc.get_sha1('foo'), sha1('hello'))
174
174
        self.assertEquals(hc.miss_count, 1)
175
175
        self.assertEquals(hc.hit_count, 0)
176
 
        # if we try again it's still too new; 
 
176
        # if we try again it's still too new;
177
177
        self.assertEquals(hc.get_sha1('foo'), sha1('hello'))
178
178
        self.assertEquals(hc.miss_count, 2)
179
179
        self.assertEquals(hc.hit_count, 0)