Fix incorrect variable in LoadChangelistInfo and recognize directories properly in GenerateDiff.

gcl.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 513 matching lines @@
   description = split_data[2]
   save = False
   if update_status:
     for file in files:
       filename = os.path.join(GetRepositoryRoot(), file[1])
       status_result = GetSVNStatus(filename)
       if not status_result or not status_result[0][0]:
         # File has been reverted.
         save = True
         files.remove(file)
-      elif status != file[0]:
+        continue
+      status = status_result[0][0]
+      if status != file[0]:
         save = True
         files[files.index(file)] = (status, file[1])
   change_info = ChangeInfo(changename, issue, description, files)
   if save:
     change_info.Save()
   return change_info
 
 
 def GetCLs():
   """Returns a list of all the changelists in this repository."""
@@ skipping 196 matching lines @@
   previous_cwd = os.getcwd()
   if root is None:
     os.chdir(GetRepositoryRoot())
   else:
     os.chdir(root)
 
   diff = []
   for file in files:
     # Use svn info output instead of os.path.isdir because the latter fails
     # when the file is deleted.
-    if GetSVNFileInfo(file).get("Node Kind") == "directory":
+    if GetSVNFileInfo(file).get("Node Kind") in ("dir", "directory"):
       continue
     # If the user specified a custom diff command in their svn config file,
     # then it'll be used when we do svn diff, which we don't want to happen
     # since we want the unified diff.  Using --diff-cmd=diff doesn't always
     # work, since they can have another diff executable in their path that
     # gives different line endings.  So we use a bogus temp directory as the
     # config directory, which gets around these problems.
     if sys.platform.startswith("win"):
       parent_dir = tempfile.gettempdir()
     else:
@@ skipping 420 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())