Mercurial > evolve

changeset 3223:73b4e84df0bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsnote: don't add '' to note while showing it in obslog
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 04 Dec 2017 15:50:32 +0530
parents adbae782aac7
children bac69ab0782c
files hgext3rd/evolve/obshistory.py tests/test-amend.t tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory.t tests/test-metaedit.t tests/test-touch.t tests/test-uncommit-interactive.t
diffstat 7 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/obshistory.py	Sun Dec 03 23:40:08 2017 +0530
+++ b/hgext3rd/evolve/obshistory.py	Mon Dec 04 15:50:32 2017 +0530
@@ -502,7 +502,7 @@
     # initial support for showing note
     if metadata.get('note'):
         fm.plain('\n    note: ')
-        fm.write('note', "'%s'", metadata['note'], label="evolve.note")
+        fm.write('note', "%s", metadata['note'], label="evolve.note")
 
     # Patch display
     if opts.get('patch'):
--- a/tests/test-amend.t	Sun Dec 03 23:40:08 2017 +0530
+++ b/tests/test-amend.t	Mon Dec 04 15:50:32 2017 +0530
@@ -26,7 +26,7 @@
   |
   x  07f494440405 (0) adda
        rewritten(branch) as 6a022cbb61d5 by test (Thu Jan 01 00:00:00 1970 +0000)
-         note: 'this a note on the obsmarker and supported for hg>=4.4'
+         note: this a note on the obsmarker and supported for hg>=4.4
   
   $ hg branch
   foo
--- a/tests/test-evolve-obshistory-complex.t	Sun Dec 03 23:40:08 2017 +0530
+++ b/tests/test-evolve-obshistory-complex.t	Mon Dec 04 15:50:32 2017 +0530
@@ -79,11 +79,11 @@
   |\
   x |  0da815c333f6 (5) E
    /     rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        note: 'folding changesets to test'
+  |        note: folding changesets to test
   |
   x  d9f908fde1a1 (6) F
        rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
-         note: 'folding changesets to test'
+         note: folding changesets to test
   
   $ hg log -G 
   @  changeset:   9:100cc25b765f
@@ -421,14 +421,14 @@
   | | | | | |
   | +-------x  d0f33db50670 (13) fold1
   | | | | |      rewritten(description, parent, content) as ec31316faa9d by test (*) (glob)
-  | | | | |        note: 'this is a note stored in obsmarker in prune'
+  | | | | |        note: this is a note stored in obsmarker in prune
   | | | | |
   +---x | |  e036916b63ea (11) fold0
   | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 by test (*) (glob)
   | | | |
   | | x |  0da815c333f6 (5) E
   | |  /     rewritten(description, content) as 100cc25b765f by test (*) (glob)
-  | | |        note: 'folding changesets to test'
+  | | |        note: folding changesets to test
   | | |
   x | |    b868bc49b0a4 (7) fold0
   |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (*) (glob)
@@ -438,7 +438,7 @@
   | | | | |
   | | | | x  d9f908fde1a1 (6) F
   | | | |      rewritten(description, parent, content) as 100cc25b765f by test (*) (glob)
-  | | | |        note: 'folding changesets to test'
+  | | | |        note: folding changesets to test
   | | | |
   x | | |  2a34000d3544 (1) A
    / / /     rewritten(description, content) as b868bc49b0a4 by test (*) (glob)
--- a/tests/test-evolve-obshistory.t	Sun Dec 03 23:40:08 2017 +0530
+++ b/tests/test-evolve-obshistory.t	Mon Dec 04 15:50:32 2017 +0530
@@ -374,7 +374,7 @@
   $ hg obslog 471597cad322 --hidden --patch
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
   $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool
@@ -411,7 +411,7 @@
   |
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
 With the all option, it should show the three changesets
@@ -422,7 +422,7 @@
   |/
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
 Check that debugobshistory on the second successor after split show
@@ -432,7 +432,7 @@
   |
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
 With the all option, it should show the three changesets
@@ -443,7 +443,7 @@
   |/
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
 Obslog with all option all should also works on the splitted commit
@@ -454,7 +454,7 @@
   |/
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
 Check that debugobshistory on both successors after split show
@@ -466,7 +466,7 @@
   |/
   x  471597cad322 (1) A0
        rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (*) (glob)
-         note: 'testing split'
+         note: testing split
          (No patch available, too many successors (2))
   
   $ hg update 471597cad322
--- a/tests/test-metaedit.t	Sun Dec 03 23:40:08 2017 +0530
+++ b/tests/test-metaedit.t	Mon Dec 04 15:50:32 2017 +0530
@@ -166,11 +166,11 @@
   |\
   x |  212b2a2b87cd (8) F
   | |    rewritten(description, user, parent, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |      note: 'folding changesets using metaedit'
+  | |      note: folding changesets using metaedit
   | |
   | x  c2bd843aa246 (6) E
   |      rewritten(description, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        note: 'folding changesets using metaedit'
+  |        note: folding changesets using metaedit
   |
   x  587528abfffe (7) F
        rewritten(user) as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-touch.t	Sun Dec 03 23:40:08 2017 +0530
+++ b/tests/test-touch.t	Mon Dec 04 15:50:32 2017 +0530
@@ -157,5 +157,5 @@
   x  [0-9a-f]{12} (.*) move (re)
        pruned by test (Thu Jan 01 00:00:00 1970 +0000)
        rewritten(.*) as [0-9a-f]{12} by test (.*) (re)
-         note: 'testing with no successor'
+         note: testing with no successor
   
--- a/tests/test-uncommit-interactive.t	Sun Dec 03 23:40:08 2017 +0530
+++ b/tests/test-uncommit-interactive.t	Mon Dec 04 15:50:32 2017 +0530
@@ -169,7 +169,7 @@
   |
   x  f70fb463d5bf (1) another one
        rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
-         note: 'note on amend --extract'
+         note: note on amend --extract
   
 The unselected part should be in the diff
 -----------------------------------------
@@ -301,11 +301,11 @@
   |
   x  678a59e5ff90 (3) another one
   |    rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      note: 'testing uncommit on dirty wdir'
+  |      note: testing uncommit on dirty wdir
   |
   x  f70fb463d5bf (1) another one
        rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
-         note: 'note on amend --extract'
+         note: note on amend --extract
   
 
 Push the changes back to the commit and more commits for more testing