Mercurial > public > mercurial-scm > python-hglib
view tests/test-log.py @ 173:8c4d24b58c23 2.1
tests: adjust test-merge for mercurial 3.7
As of changeset 88d5db4b155c, the noninteractive handler for merge
leaves conflicting files unresolved.
author | Julien Cristau <julien.cristau@logilab.fr> |
---|---|
date | Fri, 19 Feb 2016 19:16:30 +0100 |
parents | c1b966866ed7 |
children | 32e8d51ec16c |
line wrap: on
line source
from tests import common import hglib from hglib.util import b class test_log(common.basetest): def test_basic(self): self.append('a', 'a') rev0, node0 = self.client.commit(b('first'), addremove=True) self.append('a', 'a') rev1, node1 = self.client.commit(b('second')) revs = self.client.log() revs.reverse() self.assertTrue(len(revs) == 2) self.assertEquals(revs[1].node, node1) self.assertEquals(revs[0], self.client.log(b('0'))[0]) self.assertEquals(self.client.log(), self.client.log(files=[b('a')])) self.assertEquals(self.client.log(), self.client.log(hidden=True)) # def test_errors(self): # self.assertRaisesRegexp(CommandError, 'abort: unknown revision', # self.client.log, 'foo') # self.append('a', 'a') # self.client.commit('first', addremove=True) # self.assertRaisesRegexp(CommandError, # 'abort: unknown revision', # self.client.log, 'bar')