- Add '!' and 'L' status support....

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 574 matching lines @@
 
   Returns:
     Int head revision
   """
   info = CaptureSVN(options, ["info", "--xml", url], os.getcwd())
   dom = xml.dom.minidom.parseString(info)
   return int(dom.getElementsByTagName('entry')[0].getAttribute('revision'))
 
 
 class FileStatus:
-  def __init__(self, path, text_status, props, history):
+  def __init__(self, path, text_status, props, lock, history):
     self.path = path
     self.text_status = text_status
     self.props = props
+    self.lock = lock
     self.history = history
 
   def __str__(self):
     # Emulate svn status 1.5 output.
-    return (self.text_status + self.props + ' ' + self.history + ' ' +
+    return (self.text_status + self.props + self.lock + self.history + ' ' +
             self.path)
 
 
 def CaptureSVNStatus(options, path):
   """Runs 'svn status' on an existing path.
 
   Args:
     path: The directory to run svn status.
 
   Returns:
@@ skipping 14 matching lines @@
         # Col 0
         xml_item_status = wc_status[0].getAttribute('item')
         if xml_item_status == 'unversioned':
           statuses[0] = '?'
         elif xml_item_status == 'modified':
           statuses[0] = 'M'
         elif xml_item_status == 'added':
           statuses[0] = 'A'
         elif xml_item_status == 'conflicted':
           statuses[0] = 'C'
+        elif xml_item_status in ('incomplete', 'missing'):
+          statuses[0] = '!'
         elif not xml_item_status:
           pass
         else:
           raise Exception('Unknown item status "%s"; please implement me!' %
                           xml_item_status)
         # Col 1
         xml_props_status = wc_status[0].getAttribute('props')
         if xml_props_status == 'modified':
           statuses[1] = 'M'
         elif xml_props_status == 'conflicted':
           statuses[1] = 'C'
         elif (not xml_props_status or xml_props_status == 'none' or
               xml_props_status == 'normal'):
           pass
         else:
           raise Exception('Unknown props status "%s"; please implement me!' %
                           xml_props_status)
+        # Col 2
+        if wc_status[0].getAttribute('wc-locked') == 'true':
+          statuses[2] = 'L'
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
-        item = FileStatus(file, statuses[0], statuses[1], statuses[3])
+        item = FileStatus(file, statuses[0], statuses[1], statuses[2],
+                          statuses[3])
         results.append(item)
   return results
 
 
 ### SCM abstraction layer
 
 
 class SCMWrapper(object):
   """Add necessary glue between all the supported SCM.
 
@@ skipping 79 matching lines @@
       revision = int(components[1])
       forced_revision = True
 
     rev_str = ""
     if revision:
       rev_str = ' at %d' % revision
 
     if not options.path_exists(os.path.join(self._root_dir, self.relpath)):
       # We need to checkout.
       command = ['checkout', url, os.path.join(self._root_dir, self.relpath)]
+      if revision:
+        command.extend(['--revision', str(revision)])
       RunSVNAndGetFileList(options, command, self._root_dir, file_list)
+      return
 
     # Get the existing scm url and the revision number of the current checkout.
     from_info = CaptureSVNInfo(options,
                                os.path.join(self._root_dir, self.relpath, '.'),
                                '.')
 
     if options.manually_grab_svn_rev:
       # Retrieve the current HEAD version because svn is slow at null updates.
       if not revision:
         from_info_live = CaptureSVNInfo(options, from_info.url, '.')
@@ skipping 34 matching lines @@
     RunSVNAndGetFileList(options, command, self._root_dir, file_list)
 
   def revert(self, options, args, file_list):
     """Reverts local modifications. Subversion specific.
 
     All reverted files will be appended to file_list, even if Subversion
     doesn't know about them.
     """
     path = os.path.join(self._root_dir, self.relpath)
     if not os.path.isdir(path):
-      # We can't revert path that doesn't exist.
-      # TODO(maruel):  Should we update instead?
-      if options.verbose:
-        print >>options.stdout, ("\n_____ %s is missing, can't revert" %
-                                 self.relpath)
-      return
+      # svn revert won't work if the directory doesn't exist. It needs to
+      # checkout instead.
+      print >>options.stdout, ("\n_____ %s is missing, synching instead" %
+                               self.relpath)
+      # Don't reuse the args.
+      return self.update(options, [], file_list)
 
     files = CaptureSVNStatus(options, path)
     # Batch the command.
     files_to_revert = []
     for file in files:
       file_path = os.path.join(path, file.path)
       print >>options.stdout, file_path
       # Unversioned file or unexpected unversioned file.
       if file.text_status in ('?', '~'):
         # Remove extraneous file. Also remove unexpected unversioned
@@ skipping 23 matching lines @@
           accumulated_length = 0
         else:
           accumulated_paths.append(p)
           accumulated_length += len(p)
       if accumulated_paths:
         RunSVN(options, command + accumulated_paths,
                os.path.join(self._root_dir, self.relpath))
 
   def status(self, options, args, file_list):
     """Display status information."""
+    path = os.path.join(self._root_dir, self.relpath)
     command = ['status']
     command.extend(args)
-    RunSVNAndGetFileList(options, command,
-                         os.path.join(self._root_dir, self.relpath), file_list)
+    if not os.path.isdir(path):
+      # svn status won't work if the directory doesn't exist.
+      print >> options.stdout, (
+          "\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
+          "does not exist."
+          % (' '.join(command), path))
+      # There's no file list to retrieve.
+    else:
+      RunSVNAndGetFileList(options, command, path, file_list)
 
 
 ## GClient implementation.
 
 
 class GClient(object):
   """Object that represent a gclient checkout."""
 
   supported_commands = [
     'cleanup', 'diff', 'revert', 'status', 'update', 'runhooks'
@@ skipping 802 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: