# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1349213474 25200
# Node ID f7b3518c9cb4d62ecb1f9793ff7fe4b7877544b1
# Parent  0696b1793f4bfdb5c52a9cadd0171fe8ca66e366# Parent  5b1b0e4e6902983debf3db8352f0715d75ca85fc
Merge

diff -r 5b1b0e4e6902 -r f7b3518c9cb4 mercurial/pathencode.c
--- a/mercurial/pathencode.c	Tue Oct 02 14:27:13 2012 -0700
+++ b/mercurial/pathencode.c	Tue Oct 02 14:31:14 2012 -0700
@@ -55,7 +55,7 @@
 	DDEFAULT,
 };
 
-static inline int isset(const uint32_t bitset[], char c)
+static inline int inset(const uint32_t bitset[], char c)
 {
 	return bitset[((uint8_t)c) >> 5] & (1 << (((uint8_t)c) & 31));
 }
@@ -419,7 +419,7 @@
 			}
 			break;
 		case DEFAULT:
-			while (isset(onebyte, src[i])) {
+			while (inset(onebyte, src[i])) {
 				charcopy(dest, &destlen, destsize, src[i++]);
 				if (i == len)
 					goto done;
@@ -439,14 +439,14 @@
 				i++;
 				break;
 			default:
-				if (isset(onebyte, src[i])) {
+				if (inset(onebyte, src[i])) {
 					do {
 						charcopy(dest, &destlen,
 							 destsize, src[i++]);
 					} while (i < len &&
-						 isset(onebyte, src[i]));
+						 inset(onebyte, src[i]));
 				}
-				else if (isset(twobytes, src[i])) {
+				else if (inset(twobytes, src[i])) {
 					char c = src[i++];
 					charcopy(dest, &destlen, destsize, '_');
 					charcopy(dest, &destlen, destsize,