示例#1
0
    def test_gitflow_is_merged_into_remote(self):
        gitflow = GitFlow(self.repo).init()

        # devel is behind feat/even
        self.assertTrue(
            gitflow.is_merged_into('devel', 'remotes/my-remote/feat/even'))
        self.assertTrue(
            gitflow.is_merged_into('devel',
                                   gitflow.origin().refs['devel']))
        self.assertTrue(
            gitflow.is_merged_into(gitflow.origin().refs['devel'],
                                   'remotes/my-remote/feat/even'))
        self.assertTrue(
            gitflow.is_merged_into(gitflow.origin().refs['devel'],
                                   gitflow.origin().refs['devel']))

        # feat/even is ahead of devel
        self.assertFalse(gitflow.is_merged_into('feat/recursion', 'devel'))
        self.assertFalse(
            gitflow.is_merged_into('remotes/my-remote/feat/recursion',
                                   'devel'))

        self.assertFalse(
            gitflow.is_merged_into('feat/recursion',
                                   gitflow.origin().refs['devel']))
        self.assertFalse(
            gitflow.is_merged_into('remotes/my-remote/feat/recursion',
                                   gitflow.origin().refs['devel']))
示例#2
0
文件： test_core.py 项目： OBdA/gitflow 
    def test_gitflow_is_merged_into_remote(self):
        gitflow = GitFlow(self.repo).init()

        # devel is behind feat/even
        self.assertTrue(gitflow.is_merged_into(
            'devel',
            'remotes/my-remote/feat/even'))
        self.assertTrue(gitflow.is_merged_into(
            'devel',
            gitflow.origin().refs['devel']))
        self.assertTrue(gitflow.is_merged_into(
            gitflow.origin().refs['devel'],
            'remotes/my-remote/feat/even'))
        self.assertTrue(gitflow.is_merged_into(
            gitflow.origin().refs['devel'],
            gitflow.origin().refs['devel']))

        # feat/even is ahead of devel
        self.assertFalse(gitflow.is_merged_into(
            'feat/recursion',
            'devel'))
        self.assertFalse(gitflow.is_merged_into(
            'remotes/my-remote/feat/recursion',
            'devel'))

        self.assertFalse(gitflow.is_merged_into(
            'feat/recursion',
            gitflow.origin().refs['devel']))
        self.assertFalse(gitflow.is_merged_into(
            'remotes/my-remote/feat/recursion',
            gitflow.origin().refs['devel']))
示例#3
0
    def test_gitflow_is_merged_into(self):
        gitflow = GitFlow(self.repo).init()

        # feat/even is ahead of devel
        self.assertTrue(gitflow.is_merged_into('devel', 'feat/even'))
        self.assertFalse(gitflow.is_merged_into('feat/even', 'devel'))
        # devel as a symbolic ref
        self.assertFalse(
            gitflow.is_merged_into('feat/even', self.repo.refs['devel']))
        # feat/even a symbolic ref
        self.assertFalse(
            gitflow.is_merged_into(self.repo.refs['feat/even'], 'devel'))
        # HEAD
        self.assertFalse(gitflow.is_merged_into('HEAD', 'devel'))
        self.assertFalse(gitflow.is_merged_into(self.repo.head, 'devel'))
示例#4
0
文件： test_core.py 项目： OBdA/gitflow 
    def test_gitflow_is_merged_into(self):
        gitflow = GitFlow(self.repo).init()

        # feat/even is ahead of devel
        self.assertTrue(gitflow.is_merged_into('devel', 'feat/even'))
        self.assertFalse(gitflow.is_merged_into('feat/even', 'devel'))
        # devel as a symbolic ref
        self.assertFalse(gitflow.is_merged_into('feat/even',
                                                self.repo.refs['devel']))
        # feat/even a symbolic ref
        self.assertFalse(gitflow.is_merged_into(self.repo.refs['feat/even'],
                                                'devel'))
        # HEAD
        self.assertFalse(gitflow.is_merged_into('HEAD', 'devel'))
        self.assertFalse(gitflow.is_merged_into(self.repo.head, 'devel'))