annotate tests/test-resolve.py @ 123:cdde1656346f

client: add 'hidden' property to show hidden changesets.

This enables interactions with the obsolete changesets in the repository:

- add the attribute in client class
- add the keyword to the relevant commands
- enable log without hidden changesets even when self.hidden is True
- add a few tests with the hidden keyword

This changeset mirrors the behavior of the mercurial global command --hidden:
an attribute is added to the client library. If set at True, adds the hidden
keyword to all command which can use it to show hidden changesets.

The alternative would be to add the keyword in rawcommand, but the hidden flag
is not relevant for commands such as add or branch.

import common, hglib

class test_resolve(common.basetest):
    def setUp(self):
        common.basetest.setUp(self)

        self.append('a', 'a')
        self.append('b', 'b')
        rev, self.node0 = self.client.commit('first', addremove=True)

        self.append('a', 'a')
        self.append('b', 'b')
        rev, self.node1 = self.client.commit('second')

    def test_basic(self):
        self.client.update(self.node0)
        self.append('a', 'b')
        self.append('b', 'a')
        rev, self.node3 = self.client.commit('third')

        self.assertRaises(hglib.error.CommandError, self.client.merge, self.node1)
        self.assertRaises(hglib.error.CommandError, self.client.resolve, all=True)

        self.assertEquals([('U', 'a'), ('U', 'b')],
                          self.client.resolve(listfiles=True))

        self.client.resolve('a', mark=True)
        self.assertEquals([('R', 'a'), ('U', 'b')],
                          self.client.resolve(listfiles=True))