changeset 21693:9c35f3a8cac4

merge: drop the quotes around commit description We already have a ":" after the user name to denote the start of the description. The current usage of quotes around the description is problematic as the truncation to 80 chars is likely to drop the closing quote. This may confuse syntax coloration in some editors.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 26 May 2014 11:44:58 -0700
parents 5b2a2bea8cb6
children c08a22bfa16e
files mercurial/filemerge.py tests/test-commit-amend.t tests/test-conflict.t tests/test-keyword.t tests/test-merge-revert2.t tests/test-merge-tools.t tests/test-merge-types.t tests/test-merge7.t tests/test-shelve.t tests/test-subrepo.t
diffstat 10 files changed, 44 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu Aug 15 15:47:15 2013 -0500
+++ b/mercurial/filemerge.py	Mon May 26 11:44:58 2014 -0700
@@ -298,7 +298,7 @@
     '{ifeq(tags, "tip", "", "{tags} ")}' +
     '{if(bookmarks, "{bookmarks} ")}' +
     '{ifeq(branch, "default", "", "{branch} ")}' +
-    '- {author|user}: "{desc|firstline}"')
+    '- {author|user}: {desc|firstline}')
 
 _defaultconflictlabels = ['local', 'other']
 
--- a/tests/test-commit-amend.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-commit-amend.t	Mon May 26 11:44:58 2014 -0700
@@ -589,7 +589,7 @@
   no more unresolved files
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
-  changeset:   23:29ee7aa200c8
+  changeset:   23:93cd4445f720
   tag:         tip
   parent:      22:30d96aeaf27b
   parent:      21:1aa437659d19
@@ -604,11 +604,11 @@
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
-  +<<<<<<< local: 30d96aeaf27b - test: "aa"
+  +<<<<<<< local: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
-  +>>>>>>> other: 1aa437659d19  bar - test: "aazzcc"
+  +>>>>>>> other: 1aa437659d19  bar - test: aazzcc
   diff --git a/z b/zz
   rename from z
   rename to zz
@@ -621,7 +621,7 @@
   cc not renamed
   $ hg ci --amend -m 'merge bar (amend message)'
   $ hg log --config diff.git=1 -pr .
-  changeset:   24:ba3eb3e8e8c2
+  changeset:   24:832b50f2c271
   tag:         tip
   parent:      22:30d96aeaf27b
   parent:      21:1aa437659d19
@@ -636,11 +636,11 @@
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
-  +<<<<<<< local: 30d96aeaf27b - test: "aa"
+  +<<<<<<< local: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
-  +>>>>>>> other: 1aa437659d19  bar - test: "aazzcc"
+  +>>>>>>> other: 1aa437659d19  bar - test: aazzcc
   diff --git a/z b/zz
   rename from z
   rename to zz
@@ -654,7 +654,7 @@
   $ hg mv zz z
   $ hg ci --amend -m 'merge bar (undo rename)'
   $ hg log --config diff.git=1 -pr .
-  changeset:   26:0ce8747233f6
+  changeset:   26:bdafc5c72f74
   tag:         tip
   parent:      22:30d96aeaf27b
   parent:      21:1aa437659d19
@@ -669,11 +669,11 @@
   --- a/cc
   +++ b/cc
   @@ -1,1 +1,5 @@
-  +<<<<<<< local: 30d96aeaf27b - test: "aa"
+  +<<<<<<< local: 30d96aeaf27b - test: aa
    dd
   +=======
   +cc
-  +>>>>>>> other: 1aa437659d19  bar - test: "aazzcc"
+  +>>>>>>> other: 1aa437659d19  bar - test: aazzcc
   
   $ hg debugrename z
   z not renamed
@@ -690,9 +690,9 @@
   $ echo aa >> aaa
   $ hg ci -m 'merge bar again'
   $ hg log --config diff.git=1 -pr .
-  changeset:   28:b8235574e741
+  changeset:   28:32f19415b634
   tag:         tip
-  parent:      26:0ce8747233f6
+  parent:      26:bdafc5c72f74
   parent:      27:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -725,9 +725,9 @@
   $ hg mv aaa aa
   $ hg ci --amend -m 'merge bar again (undo rename)'
   $ hg log --config diff.git=1 -pr .
-  changeset:   30:dbafc132c18a
+  changeset:   30:1e2a06b3d312
   tag:         tip
-  parent:      26:0ce8747233f6
+  parent:      26:bdafc5c72f74
   parent:      27:4c94d5bc65f5
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -765,9 +765,9 @@
   use (c)hanged version or (d)elete? c
   $ hg ci -m 'merge bar (with conflicts)'
   $ hg log --config diff.git=1 -pr .
-  changeset:   33:8b0c83445ff5
+  changeset:   33:97a298b0c59f
   tag:         tip
-  parent:      32:f60ace0fe178
+  parent:      32:3d78ce4226b8
   parent:      31:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -777,9 +777,9 @@
   $ hg rm aa
   $ hg ci --amend -m 'merge bar (with conflicts, amended)'
   $ hg log --config diff.git=1 -pr .
-  changeset:   35:f9b6726d8bd2
+  changeset:   35:6de0c1bde1c8
   tag:         tip
-  parent:      32:f60ace0fe178
+  parent:      32:3d78ce4226b8
   parent:      31:67db8847a540
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-conflict.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-conflict.t	Mon May 26 11:44:58 2014 -0700
@@ -22,11 +22,11 @@
   32e80765d7fe+75234512624c+ tip
 
   $ cat a
-  <<<<<<< local: 32e80765d7fe - test: "branch2"
+  <<<<<<< local: 32e80765d7fe - test: branch2
   something else
   =======
   something
-  >>>>>>> other: 75234512624c  - test: "branch1"
+  >>>>>>> other: 75234512624c  - test: branch1
 
   $ hg status
   M a
--- a/tests/test-keyword.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-keyword.t	Mon May 26 11:44:58 2014 -0700
@@ -1049,11 +1049,11 @@
   [1]
   $ cat m
   $Id$
-  <<<<<<< local: 88a80c8d172e - test: "8bar"
+  <<<<<<< local: 88a80c8d172e - test: 8bar
   bar
   =======
   foo
-  >>>>>>> other: 85d2d2d732a5  - test: "simplemerge"
+  >>>>>>> other: 85d2d2d732a5  - test: simplemerge
 
 resolve to local
 
--- a/tests/test-merge-revert2.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-merge-revert2.t	Mon May 26 11:44:58 2014 -0700
@@ -57,11 +57,11 @@
   @@ -1,3 +1,7 @@
    added file1
    another line of text
-  +<<<<<<< working copy: c3fa057dd86f  - test: "added file1 and file2"
+  +<<<<<<< working copy: c3fa057dd86f  - test: added file1 and file2
   +changed file1 different
   +=======
    changed file1
-  +>>>>>>> destination:  dfab7f3c2efb - test: "changed file1"
+  +>>>>>>> destination:  dfab7f3c2efb - test: changed file1
 
   $ hg status
   M file1
--- a/tests/test-merge-tools.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-merge-tools.t	Mon May 26 11:44:58 2014 -0700
@@ -66,11 +66,11 @@
   [1]
   $ aftermerge
   # cat f
-  <<<<<<< local: ef83787e2614  - test: "revision 1"
+  <<<<<<< local: ef83787e2614  - test: revision 1
   revision 1
   =======
   revision 2
-  >>>>>>> other: 0185f4e0cf02  - test: "revision 2"
+  >>>>>>> other: 0185f4e0cf02  - test: revision 2
   space
   # hg stat
   M f
--- a/tests/test-merge-types.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-merge-types.t	Mon May 26 11:44:58 2014 -0700
@@ -290,18 +290,18 @@
   U h
   $ tellmeabout a
   a is a plain file with content:
-  <<<<<<< local: 0139c5610547 - test: "2"
+  <<<<<<< local: 0139c5610547 - test: 2
   2
   =======
   1
-  >>>>>>> other: 97e29675e796  - test: "1"
+  >>>>>>> other: 97e29675e796  - test: 1
   $ tellmeabout b
   b is a plain file with content:
-  <<<<<<< local: 0139c5610547 - test: "2"
+  <<<<<<< local: 0139c5610547 - test: 2
   2
   =======
   1
-  >>>>>>> other: 97e29675e796  - test: "1"
+  >>>>>>> other: 97e29675e796  - test: 1
   $ tellmeabout c
   c is a plain file with content:
   x
@@ -345,18 +345,18 @@
   [1]
   $ tellmeabout a
   a is a plain file with content:
-  <<<<<<< local: 97e29675e796  - test: "1"
+  <<<<<<< local: 97e29675e796  - test: 1
   1
   =======
   2
-  >>>>>>> other: 0139c5610547 - test: "2"
+  >>>>>>> other: 0139c5610547 - test: 2
   $ tellmeabout b
   b is an executable file with content:
-  <<<<<<< local: 97e29675e796  - test: "1"
+  <<<<<<< local: 97e29675e796  - test: 1
   1
   =======
   2
-  >>>>>>> other: 0139c5610547 - test: "2"
+  >>>>>>> other: 0139c5610547 - test: 2
   $ tellmeabout c
   c is an executable file with content:
   x
--- a/tests/test-merge7.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-merge7.t	Mon May 26 11:44:58 2014 -0700
@@ -98,11 +98,11 @@
 
   $ cat test.txt
   one
-  <<<<<<< local: 50c3a7e29886  - test: "Merge 1"
+  <<<<<<< local: 50c3a7e29886  - test: Merge 1
   two-point-five
   =======
   two-point-one
-  >>>>>>> other: 40d11a4173a8 - test: "two -> two-point-one"
+  >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one
   three
 
   $ hg debugindex test.txt
--- a/tests/test-shelve.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-shelve.t	Mon May 26 11:44:58 2014 -0700
@@ -210,11 +210,11 @@
   +++ b/a/a
   @@ -1,2 +1,6 @@
    a
-  +<<<<<<< dest: *  - shelve: "pending changes temporary commit" (glob)
+  +<<<<<<< dest:   *  - shelve: pending changes temporary commit (glob)
    c
   +=======
   +a
-  +>>>>>>> source: * - shelve: "changes to '[mq]: second.patch'" (glob)
+  +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch'
   diff --git a/b.rename/b b/b.rename/b
   new file mode 100644
   --- /dev/null
@@ -602,11 +602,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< dest:   5f6b880e719b  - shelve: "pending changes temporary commit"
+  <<<<<<< dest:   5f6b880e719b  - shelve: pending changes temporary commit
   g
   =======
   f
-  >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
+  >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff'
   $ cat f.orig
   g
   $ hg unshelve --abort
@@ -645,11 +645,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< dest:   6b563750f973  - test: "intermediate other change"
+  <<<<<<< dest:   *  - test: intermediate other change (glob)
   g
   =======
   f
-  >>>>>>> source: 23b29cada8ba - shelve: "changes to 'commit stuff'"
+  >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff'
   $ cat f.orig
   g
   $ hg unshelve --abort
--- a/tests/test-subrepo.t	Thu Aug 15 15:47:15 2013 -0500
+++ b/tests/test-subrepo.t	Mon May 26 11:44:58 2014 -0700
@@ -298,11 +298,11 @@
 should conflict
 
   $ cat t/t
-  <<<<<<< local: 20a0db6fbf6c - test: "10"
+  <<<<<<< local: 20a0db6fbf6c - test: 10
   conflict
   =======
   t3
-  >>>>>>> other: 7af322bc1198  - test: "7"
+  >>>>>>> other: 7af322bc1198  - test: 7
 
 clone