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

revset: add ^ and ~ operators from parentrevspec extension...

revset: add ^ and ~ operators from parentrevspec extension ^ (Nth parent) and ~ (Nth first ancestor) are infix operators that match certain ancestors of the set: set^0 the set set^1 (also available as set^) the first parent of every changeset in set set^2 the second parent of every changeset in set set~0 the set set~1 the first ancestor (i.e. the first parent) of every changeset in set set~2 the second ancestor (i.e. first parent of first parent) of every changeset in set set~N the Nth ancestor (following first parents only) of every changeset in set; set~N is equivalent to set^1^1..., with ^1 repeated N times.

Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r12865:4c50552f stable


                r14070:305c9767

default

Download file

             test-bdiff.py
        
                    52 lines
            
             | 1.2 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"

	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"