Merge with default

hgext/color.py

@@ -117,10 +117,16 b' def _colorstatuslike(abbreviations, effe'
 
     # apply color to output and display it
     for i in xrange(len(lines)):
-        status = abbreviations[lines_with_status[i][0]]
-        effects = effectdefs[status]
-        if effects:
-            lines[i] = render_effects(lines[i], effects)
+        try:
+            status = abbreviations[lines_with_status[i][0]]
+        except KeyError:
+            # Ignore lines with invalid codes, especially in the case of
+            # of unknown filenames containing newlines (issue2036).
+            pass
+        else:
+            effects = effectdefs[status]
+            if effects:
+                lines[i] = render_effects(lines[i], effects)
         ui.write(lines[i] + delimiter)
     return retval
 

tests/test-eolfilename

@@ -3,6 +3,7 b''
 
 "$TESTDIR/hghave" eol-in-paths || exit 80
 
+echo % test issue352
 hg init foo
 cd foo
 
@@ -21,4 +22,22 b' hg ci -A -m m'
 echo foo > "$A"
 hg debugwalk
 
+# http://mercurial.selenic.com/bts/issue2036
+cd ..
+echo % test issue2039
+
+hg init bar
+cd bar
+
+echo "[extensions]" >> $HGRCPATH
+echo "color=" >> $HGRCPATH
+
+A=`printf 'foo\nbar'`
+B=`printf 'foo\nbar.baz'`
+
+touch "$A"
+touch "$B"
+
+hg status --color=always
+
 exit 0

tests/test-eolfilename.out

@@ -1,3 +1,4 b''
+% test issue352
 adding he
llo
 abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
 adding he
llo
@@ -12,3 +13,8 b' f he\rllo he\rllo'
 f  hell
 o  hell
 o
+% test issue2039
+? foo
+bar
+? foo
+bar.baz