Mercurial > hg-stable

diff hgext/largefiles/overrides.py @ 20148:7ac03bfa1369 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: don't crash on 'local renamed directory' actions a12798938721 introduced splitstandin on all action filenames. It would however crash on 'd' actions where the filename is None. Fix that and add test coverage for that case.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Nov 2013 15:38:33 +0100
parents e92c6524a76d
children 28fe5abc906f
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Fri Nov 22 19:13:07 2013 +0100
+++ b/hgext/largefiles/overrides.py	Tue Nov 26 15:38:33 2013 +0100
@@ -380,7 +380,7 @@
     for action in actions:
         f, m, args, msg = action
 
-        splitstandin = lfutil.splitstandin(f)
+        splitstandin = f and lfutil.splitstandin(f)
         if (m == "g" and splitstandin is not None and
             splitstandin in p1 and splitstandin not in removes):
             # Case 1: normal file in the working copy, largefile in