##// END OF EJS Templates
merge with stable
Matt Mackall -
r15773:371cff96 merge default
parent child Browse files
Show More
@@ -24,7 +24,7 b''
24 <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
24 <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
25
25
26 <!-- templates.wxs -->
26 <!-- templates.wxs -->
27 <?define templates.root.guid = {111509CB-4C96-4035-80BC-F66A99CD5ACB} ?>
27 <?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?>
28 <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?>
28 <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?>
29 <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
29 <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?>
30 <?define templates.gitweb.guid = {6A33D168-F84E-45AA-912C-23CAC2D66BCA} ?>
30 <?define templates.gitweb.guid = {6A33D168-F84E-45AA-912C-23CAC2D66BCA} ?>
@@ -31,6 +31,7 b''
31 <File Name="map-cmdline.changelog" KeyPath="yes" />
31 <File Name="map-cmdline.changelog" KeyPath="yes" />
32 <File Name="map-cmdline.compact" />
32 <File Name="map-cmdline.compact" />
33 <File Name="map-cmdline.default" />
33 <File Name="map-cmdline.default" />
34 <File Name="map-cmdline.bisect" />
34 <File Name="map-cmdline.xml" />
35 <File Name="map-cmdline.xml" />
35 <File Name="template-vars.txt" />
36 <File Name="template-vars.txt" />
36 </Component>
37 </Component>
@@ -2694,7 +2694,7 b' def grep(ui, repo, pattern, *pats, **opt'
2694
2694
2695 Returns 0 if a match is found, 1 otherwise.
2695 Returns 0 if a match is found, 1 otherwise.
2696 """
2696 """
2697 reflags = 0
2697 reflags = re.M
2698 if opts.get('ignore_case'):
2698 if opts.get('ignore_case'):
2699 reflags |= re.I
2699 reflags |= re.I
2700 try:
2700 try:
@@ -1117,7 +1117,7 b' Filters work:'
1117 $ hg log --template '{date|age}\n' > /dev/null || exit 1
1117 $ hg log --template '{date|age}\n' > /dev/null || exit 1
1118
1118
1119 $ hg log -l1 --template '{date|age}\n'
1119 $ hg log -l1 --template '{date|age}\n'
1120 8 years from now
1120 7 years from now
1121 $ hg log --template '{date|date}\n'
1121 $ hg log --template '{date|date}\n'
1122 Wed Jan 01 10:01:00 2020 +0000
1122 Wed Jan 01 10:01:00 2020 +0000
1123 Mon Jan 12 13:46:40 1970 +0000
1123 Mon Jan 12 13:46:40 1970 +0000
@@ -59,8 +59,9 b' other'
59
59
60 follow
60 follow
61
61
62 $ hg grep --traceback -f 'import$' port2
62 $ hg grep --traceback -f 'import\n\Z' port2
63 port:0:import
63 port:0:import
64
64 $ echo deport >> port2
65 $ echo deport >> port2
65 $ hg commit -m 5 -u eggs -d '6 0'
66 $ hg commit -m 5 -u eggs -d '6 0'
66 $ hg grep -f --all -nu port port2
67 $ hg grep -f --all -nu port port2
General Comments 0
You need to be logged in to leave comments. Login now