upstream/mercurial-mirror Files · tests/test-bdiff.py

dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True"...

dispatch: make "_checkshellalias()" invoke "findcmd()" with "strict=True" Before this patch, shell alias may be executed by abbreviated command name unexpectedly, even if abbreviated command name matches also against the command provided by extension. For example, "rebate" shell alias is executed by "hg reba", even if rebase extension (= "rebase" command) is enabled. In this case, "hg reba" should be aborted because of command name ambiguity. This patch makes "_checkshellalias()" invoke "cmdutil.findcmd()" always with "strict=True" (default value). If abbreviated command name matches against only one shell alias even after loading extensions, such shell alias will be executed via "_parse()". This patch doesn't remove "_checkshellalias()" invocation itself, because it may prevent shell alias from loading extensions uselessly.

Patrick Mezard - - Load All Authors

File last commit:

r15530:eeac5e17 default


                r20328:03d345da

stable

Download file

             test-bdiff.py
        
                    66 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / test-bdiff.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import struct

      from mercurial import bdiff, mpatch

      def test1(a, b):

          d = bdiff.bdiff(a, b)

          c = a

          if d:

              c = mpatch.patches(a, [d])

          if c != b:

              print "***", repr(a), repr(b)

              print "bad:"

              print repr(c)[:200]

              print repr(d)

      def test(a, b):

          print "***", repr(a), repr(b)

          test1(a, b)

          test1(b, a)

      test("a\nc\n\n\n\n", "a\nb\n\n\n")

      test("a\nb\nc\n", "a\nc\n")

      test("", "")

      test("a\nb\nc", "a\nb\nc")

      test("a\nb\nc\nd\n", "a\nd\n")

      test("a\nb\nc\nd\n", "a\nc\ne\n")

      test("a\nb\nc\n", "a\nc\n")

      test("a\n", "c\na\nb\n")

      test("a\n", "")

      test("a\n", "b\nc\n")

      test("a\n", "c\na\n")

      test("", "adjfkjdjksdhfksj")

      test("", "ab")

      test("", "abc")

      test("a", "a")

      test("ab", "ab")

      test("abc", "abc")

      test("a\n", "a\n")

      test("a\nb", "a\nb")

      #issue1295

      def showdiff(a, b):

          bin = bdiff.bdiff(a, b)

          pos = 0

          while pos < len(bin):

              p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])

              pos += 12

              print p1, p2, repr(bin[pos:pos + l])

              pos += l

      showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n")

      showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n")

      print "done"

      def testfixws(a, b, allws):

          c = bdiff.fixws(a, allws)

          if c != b:

              print "*** fixws", repr(a), repr(b), allws

              print "got:"

              print repr(c)

      testfixws(" \ta\r b\t\n", "ab\n", 1)

      testfixws(" \ta\r b\t\n", " a b\n", 0)

      testfixws("", "", 1)

      testfixws("", "", 0)

      print "done"

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				import struct
				from mercurial import bdiff, mpatch

				def test1(a, b):
				d = bdiff.bdiff(a, b)
				c = a
				if d:
				c = mpatch.patches(a, [d])
				if c != b:
				print "***", repr(a), repr(b)
				print "bad:"
				print repr(c)[:200]
				print repr(d)

				def test(a, b):
				print "***", repr(a), repr(b)
				test1(a, b)
				test1(b, a)

				test("a\nc\n\n\n\n", "a\nb\n\n\n")
				test("a\nb\nc\n", "a\nc\n")
				test("", "")
				test("a\nb\nc", "a\nb\nc")
				test("a\nb\nc\nd\n", "a\nd\n")
				test("a\nb\nc\nd\n", "a\nc\ne\n")
				test("a\nb\nc\n", "a\nc\n")
				test("a\n", "c\na\nb\n")
				test("a\n", "")
				test("a\n", "b\nc\n")
				test("a\n", "c\na\n")
				test("", "adjfkjdjksdhfksj")
				test("", "ab")
				test("", "abc")
				test("a", "a")
				test("ab", "ab")
				test("abc", "abc")
				test("a\n", "a\n")
				test("a\nb", "a\nb")

				#issue1295
				def showdiff(a, b):
				bin = bdiff.bdiff(a, b)
				pos = 0
				while pos < len(bin):
				p1, p2, l = struct.unpack(">lll", bin[pos:pos + 12])
				pos += 12
				print p1, p2, repr(bin[pos:pos + l])
				pos += l
				showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\nx\n\nz\n")
				showdiff("x\n\nx\n\nx\n\nx\n\nz\n", "x\n\nx\n\ny\n\nx\n\ny\n\nx\n\nz\n")

				print "done"

				def testfixws(a, b, allws):
				c = bdiff.fixws(a, allws)
				if c != b:
				print "*** fixws", repr(a), repr(b), allws
				print "got:"
				print repr(c)

				testfixws(" \ta\r b\t\n", "ab\n", 1)
				testfixws(" \ta\r b\t\n", " a b\n", 0)
				testfixws("", "", 1)
				testfixws("", "", 0)

				print "done"