Mercurial > public > mercurial-scm > python-hglib
view tests/test-annotate.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 |
line wrap: on
line source
from tests import common from hglib.util import b class test_annotate(common.basetest): def test_basic(self): self.append('a', 'a\n') rev, node0 = self.client.commit(b('first'), addremove=True) self.append('a', 'a\n') rev, node1 = self.client.commit(b('second')) self.assertEquals(list(self.client.annotate(b('a'))), [(b('0'), b('a')), (b('1'), b('a'))]) self.assertEquals(list( self.client.annotate( b('a'), user=True, file=True, number=True, changeset=True, line=True, verbose=True)), [(b('test 0 ') + node0[:12] + b(' a:1'), b('a')), (b('test 1 ') + node1[:12] + b(' a:2'), b('a'))]) def test_files(self): self.append('a', 'a\n') rev, node0 = self.client.commit(b('first'), addremove=True) self.append('b', 'b\n') rev, node1 = self.client.commit(b('second'), addremove=True) self.assertEquals(list(self.client.annotate([b('a'), b('b')])), [(b('0'), b('a')), (b('1'), b('b'))]) def test_two_colons(self): self.append('a', 'a: b\n') self.client.commit(b('first'), addremove=True) self.assertEquals(list(self.client.annotate(b('a'))), [(b('0'), b('a: b'))])