# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1363726174 25200
# Node ID a1279893872194de7205bf34ef06fa74cf7ee3e7
# Parent  b99e62a9b7a21d3f684f90c9df6578baf8023e30
largefiles: don't query the dirstate for key None

lfutil.splitstandin(f) can be None, and we query the dirstate for that without
checking if it is. This will cause problems with the upcoming move to critbit-
based dicts, since they only support strings as keys.

diff -r b99e62a9b7a2 -r a12798938721 hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Mon Mar 18 19:59:05 2013 -0500
+++ b/hgext/largefiles/overrides.py	Tue Mar 19 13:49:34 2013 -0700
@@ -374,10 +374,13 @@
         f, m, args, msg = action
 
         choices = (_('&Largefile'), _('&Normal file'))
-        if m == "g" and lfutil.splitstandin(f) in p1 and f in p2:
+
+        splitstandin = lfutil.splitstandin(f)
+        if (m == "g" and splitstandin is not None and
+            splitstandin in p1 and f in p2):
             # Case 1: normal file in the working copy, largefile in
             # the second parent
-            lfile = lfutil.splitstandin(f)
+            lfile = splitstandin
             standin = f
             msg = _('%s has been turned into a largefile\n'
                     'use (l)argefile or keep as (n)ormal file?') % lfile