Mercurial > hg
view tests/test-hg-parseurl.py @ 38667:572dff5c946e
rebase: add --confirm option
This feature adds a functionality in rebase to confirm before applying
changes.
When there is no conflict and user confirm to apply actions, we just
finish the unfinished rebase. But when there is a conflict and user
confirm to apply actions then we can't just finish rebasing using
rbsrt._finishrebase() because in-memory merge doesn't support conflicts, so
we have to abort and run on-disk merge in this case.
And if user doesn't confirm to apply actions then simply abort the rebase.
Differential Revision: https://phab.mercurial-scm.org/D3870
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 30 Jun 2018 12:42:49 +0530 |
parents | 5dd71e9ae68a |
children | 2372284d9457 |
line wrap: on
line source
from __future__ import absolute_import, print_function import unittest from mercurial import ( hg, ) class ParseRequestTests(unittest.TestCase): def testparse(self): self.assertEqual(hg.parseurl(b'http://example.com/no/anchor'), (b'http://example.com/no/anchor', (None, []))) self.assertEqual(hg.parseurl(b'http://example.com/an/anchor#foo'), (b'http://example.com/an/anchor', (b'foo', []))) self.assertEqual( hg.parseurl(b'http://example.com/no/anchor/branches', [b'foo']), (b'http://example.com/no/anchor/branches', (None, [b'foo']))) self.assertEqual( hg.parseurl(b'http://example.com/an/anchor/branches#bar', [b'foo']), (b'http://example.com/an/anchor/branches', (b'bar', [b'foo']))) self.assertEqual(hg.parseurl( b'http://example.com/an/anchor/branches-None#foo', None), (b'http://example.com/an/anchor/branches-None', (b'foo', []))) self.assertEqual(hg.parseurl(b'http://example.com/'), (b'http://example.com/', (None, []))) self.assertEqual(hg.parseurl(b'http://example.com'), (b'http://example.com/', (None, []))) self.assertEqual(hg.parseurl(b'http://example.com#foo'), (b'http://example.com/', (b'foo', []))) if __name__ == '__main__': import silenttestrunner silenttestrunner.main(__name__)