Mercurial > hg

changeset 15591:97fc5eec3f43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Nov 2011 17:15:39 -0600
parents dbdb8aa70503 (current diff) 3da1f60fc80d (diff)
children 39f418979059
files mercurial/patch.py tests/test-lfconvert.t
diffstat 3 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/largefiles/lfcommands.py	Fri Nov 04 10:18:40 2011 +0100
+++ b/hgext/largefiles/lfcommands.py	Wed Nov 30 17:15:39 2011 -0600
@@ -71,9 +71,7 @@
             lfiles = set()
             normalfiles = set()
             if not pats:
-                pats = ui.config(lfutil.longname, 'patterns', default=())
-                if pats:
-                    pats = pats.split(' ')
+                pats = ui.configlist(lfutil.longname, 'patterns', default=[])
             if pats:
                 matcher = match_.match(rsrc.root, '', list(pats))
             else:
--- a/mercurial/patch.py	Fri Nov 04 10:18:40 2011 +0100
+++ b/mercurial/patch.py	Wed Nov 30 17:15:39 2011 -0600
@@ -1639,7 +1639,7 @@
                 if line.startswith('@'):
                     head = False
             else:
-                if line and not line[0] in ' +-@':
+                if line and not line[0] in ' +-@\\':
                     head = True
             stripline = line
             if not head and line and line[0] in '+-':
--- a/tests/test-lfconvert.t	Fri Nov 04 10:18:40 2011 +0100
+++ b/tests/test-lfconvert.t	Wed Nov 30 17:15:39 2011 -0600
@@ -5,7 +5,8 @@
   > graphlog =
   > [largefiles]
   > minsize = 0.5
-  > patterns = **.dat
+  > patterns = **.other
+  >     **.dat
   > EOF
 
 "lfconvert" works