upstream/mercurial-mirror Commit - r30432:36334038

bdiff: give slight preference to appending lines...

Mads Kiilerich -

r30432:36334038 default

parent child

mercurial/bdiff.c

0 +1 -1

             					/* same match but closer to half */
             					mi = i;
             					mj = j;
-            				} else if (i == mi && mj > bhalf) {
+            				} else if (i == mi && (mj > bhalf || i == a1)) {
             					/* same i but best earlier j */
             					mj = j;
             				}

tests/test-annotate.t

0 +11 -11

             annotate -n b
               $ hg annotate -n b
+: a
 : a
-: a
 : a
 : b4
 : b5
             annotate -nl b
               $ hg annotate -nl b
-:1: a
 :1: a
+:2: a
 :3: a
 :4: b4
 :5: b5
             annotate -nf b
               $ hg annotate -nf b
+a: a
 a: a
-a: a
 a: a
 b: b4
 b: b5
             annotate -nlf b
               $ hg annotate -nlf b
-a:1: a
 a:1: a
+a:2: a
 a:3: a
 b:4: b4
 b:5: b5
             annotate after merge
               $ hg annotate -nf b
+a: a
 a: a
-a: a
 a: a
 b: b4
 b: c
             annotate after merge with -l
               $ hg annotate -nlf b
-a:1: a
 a:1: a
+a:2: a
 a:3: a
 b:4: b4
 b:5: c
             annotate after rename merge
               $ hg annotate -nf b
 a: a
 b: z
 a: a
 b: b4
             annotate after rename merge with -l
               $ hg annotate -nlf b
 a:1: a
 b:2: z
 a:3: a
 b:4: b4
               $ echo more >> b
               $ hg ci -mmore -d '7 0'
               $ hg annotate -nlf b
 a: 1: a
 b: 2: z
 a: 3: a
 b: 4: b4
             linkrev vs rev
               $ hg annotate -r tip -n a
+: a
 : a
-: a
 : a
             linkrev vs rev with -l
               $ hg annotate -r tip -nl a
-:1: a
 :1: a
+:2: a
 :3: a
             Issue589: "undelete" sequence leads to crash

tests/test-bdiff.py

0 +2 -2

                 ''.join('<%s\n-\n' % i for i in range(5)),
                 ''.join('>%s\n-\n' % i for i in range(5)))
-            print("Diff 1 to 3 lines - preference for balanced recursion:")
+            print("Diff 1 to 3 lines - preference for appending:")
             showdiff('a\n', 'a\n' * 3)
-            print("Diff 1 to 5 lines - preference for balanced recursion:")
+            print("Diff 1 to 5 lines - preference for appending:")
             showdiff('a\n', 'a\n' * 5)
             print("Diff 3 to 1 lines - preference for balanced recursion:")
             showdiff('a\n' * 3, 'a\n')

tests/test-bdiff.py.out

0 +4 -6

              '-\n'
 23 '<4\n' -> '>4\n'
              '-\n'
-            Diff 1 to 3 lines - preference for balanced recursion:
+            Diff 1 to 3 lines - preference for appending:
             showdiff(
               'a\n',
               'a\na\na\n'):
-0 '' -> 'a\n'
              'a\n'
-2 '' -> 'a\n'
+2 '' -> 'a\na\n'
-            Diff 1 to 5 lines - preference for balanced recursion:
+            Diff 1 to 5 lines - preference for appending:
             showdiff(
               'a\n',
               'a\na\na\na\na\n'):
-0 '' -> 'a\na\n'
              'a\n'
-2 '' -> 'a\na\n'
+2 '' -> 'a\na\na\na\n'
             Diff 3 to 1 lines - preference for balanced recursion:
             showdiff(
               'a\na\na\n',

tests/test-commit-amend.t

0 +8 -8

               --- a/a	Thu Jan 01 00:00:00 1970 +0000
               +++ b/a	Thu Jan 01 00:00:00 1970 +0000
               @@ -1,1 +1,3 @@
+               a
               +a
               +a
               $ hg log
               changeset:   1:43f1ba15f28a
               uncompressed size of bundle content:
 (changelog)
 (manifests)
 a
               saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob)
 changesets found
               uncompressed size of bundle content:
 (changelog)
 (manifests)
 a
               adding branch
               adding changesets
               adding manifests
               --- a/a	Thu Jan 01 00:00:00 1970 +0000
               +++ b/a	Thu Jan 01 00:00:00 1970 +0000
               @@ -1,1 +1,3 @@
+               a
               +a
               +a
               $ hg log
               changeset:   1:1cd866679df8
               uncompressed size of bundle content:
 (changelog)
 (manifests)
 a
               saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob)
 changesets found
               uncompressed size of bundle content:
 (changelog)
 (manifests)
 a
               adding branch
               adding changesets
               adding manifests
               uncompressed size of bundle content:
 (changelog)
 (manifests)
 a
               saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob)
 changesets found
               uncompressed size of bundle content:
 (changelog)
 (manifests)
 a
               adding branch
               adding changesets
               adding manifests

tests/test-mq-qfold.t

0 +2 -2

               --- a/a
               +++ b/a
               @@ -1,1 +1,3 @@
+               a
               +a
               +b
             Fold with local changes:
               --- a/a
               +++ b/a
               @@ -1,1 +1,3 @@
+               a
               +a
               +b
               $ hg revert -a --no-backup

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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