Bring some OOP and sanity to gclient.py.

tests/gclient_smoketest.py

Index: tests/gclient_smoketest.py
diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index 0ec8984fc49185ed4651fb5d2f8583a3dd39c673..3002b0c142b2d78fcff7f61490ffe7755a1fcdf0 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -383,8 +383,14 @@ class GClientSmokeSVN(GClientSmokeBase):
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(base)s/src@2;\n'
-           'src/other: %(base)s/other@2;\n'
+    out = ('src: %(base)s/src\n'
+           'src/other: %(base)s/other\n'
+           'src/third_party/foo: %(base)s/third_party/foo@1\n' %
+          { 'base': self.svn_base + 'trunk' })
+    self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(base)s/src@2\n'
+           'src/other: %(base)s/other@2\n'
            'src/third_party/foo: %(base)s/third_party/foo@1\n' %
           { 'base': self.svn_base + 'trunk' })
     self.check((out, '', 0), results)
@@ -562,8 +568,19 @@ class GClientSmokeGIT(GClientSmokeBase):
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(base)srepo_1@%(hash1)s;\n'
-           'src/repo2: %(base)srepo_2@%(hash2)s;\n'
+    out = ('src: %(base)srepo_1\n'
+           'src/repo2: %(base)srepo_2@%(hash2)s\n'
+           'src/repo2/repo_renamed: %(base)srepo_3\n' %
+          {
+            'base': self.git_base,
+            'hash1': self.githash('repo_1', 2)[:7],
+            'hash2': self.githash('repo_2', 1)[:7],
+            'hash3': self.githash('repo_3', 2)[:7],
+          })
+    self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(base)srepo_1@%(hash1)s\n'
+           'src/repo2: %(base)srepo_2@%(hash2)s\n'
            'src/repo2/repo_renamed: %(base)srepo_3@%(hash3)s\n' %
           {
             'base': self.git_base,
@@ -593,7 +610,7 @@ class GClientSmokeBoth(GClientSmokeBase):
     # 3x svn checkout, 3x run hooks
     self.checkBlock(results[0],
                     ['running', 'running', 'running', 'running', 'running',
-                     'running', 'running'])
+                     'running'])
     # TODO(maruel): Something's wrong here. git outputs to stderr 'Switched to
     # new branch \'hash\''.
     #self.checkString('', results[1])
@@ -608,7 +625,6 @@ class GClientSmokeBoth(GClientSmokeBase):
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
-    tree['src/svn_hooked2'] = 'svn_hooked2'
     self.assertTree(tree)
 
   def testMultiSolutionsMultiRev(self):
@@ -649,11 +665,25 @@ class GClientSmokeBoth(GClientSmokeBase):
         '"url": "' + self.git_base + 'repo_1"}]'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(svn_base)s/src/@2;\n'
-           'src-git: %(git_base)srepo_1@%(hash1)s;\n'
-           'src/other: %(svn_base)s/other@2;\n'
-           'src/repo2: %(git_base)srepo_2@%(hash2)s;\n'
-           'src/repo2/repo_renamed: %(git_base)srepo_3@%(hash3)s;\n'
+    out = ('src: %(svn_base)s/src/\n'
+           'src-git: %(git_base)srepo_1\n'
+           'src/other: %(svn_base)s/other\n'
+           'src/repo2: %(git_base)srepo_2@%(hash2)s\n'
+           'src/repo2/repo_renamed: %(git_base)srepo_3\n'
+           'src/third_party/foo: %(svn_base)s/third_party/foo@1\n') % {
+               'svn_base': self.svn_base + 'trunk',
+               'git_base': self.git_base,
+               'hash1': self.githash('repo_1', 2)[:7],
+               'hash2': self.githash('repo_2', 1)[:7],
+               'hash3': self.githash('repo_3', 2)[:7],
+          }
+    self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(svn_base)s/src/@2\n'
+           'src-git: %(git_base)srepo_1@%(hash1)s\n'
+           'src/other: %(svn_base)s/other@2\n'
+           'src/repo2: %(git_base)srepo_2@%(hash2)s\n'
+           'src/repo2/repo_renamed: %(git_base)srepo_3@%(hash3)s\n'
            'src/third_party/foo: %(svn_base)s/third_party/foo@1\n') % {
                'svn_base': self.svn_base + 'trunk',
                'git_base': self.git_base,