Mercurial > public > mercurial-scm > python-hglib
view tests/test-grep.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 | 1a318162f06f |
line wrap: on
line source
from tests import common from hglib.util import b class test_grep(common.basetest): def test_basic(self): self.append('a', 'a\n') self.append('b', 'ab\n') self.client.commit(b('first'), addremove=True) # no match self.assertEquals(list(self.client.grep(b('c'))), []) self.assertEquals(list(self.client.grep(b('a'))), [(b('a'), b('0'), b('a')), (b('b'), b('0'), b('ab'))]) self.assertEquals(list(self.client.grep(b('a'), b('a'))), [(b('a'), b('0'), b('a'))]) self.assertEquals(list(self.client.grep(b('b'))), [(b('b'), b('0'), b('ab'))]) def test_options(self): self.append('a', 'a\n') self.append('b', 'ab\n') rev, node = self.client.commit(b('first'), addremove=True) self.assertEquals([(b('a'), b('0'), b('+'), b('a')), (b('b'), b('0'), b('+'), b('ab'))], list(self.client.grep(b('a'), all=True))) self.assertEquals([(b('a'), b('0')), (b('b'), b('0'))], list(self.client.grep(b('a'), fileswithmatches=True))) self.assertEquals([(b('a'), b('0'), b('1'), b('a')), (b('b'), b('0'), b('1'), b('ab'))], list(self.client.grep(b('a'), line=True))) self.assertEquals([(b('a'), b('0'), b('test'), b('a')), (b('b'), b('0'), b('test'), b('ab'))], list(self.client.grep(b('a'), user=True))) self.assertEquals([(b('a'), b('0'), b('1'), b('+'), b('test')), (b('b'), b('0'), b('1'), b('+'), b('test'))], list(self.client.grep(b('a'), all=True, user=True, line=True, fileswithmatches=True)))