| Index: tests/gclient_scm_test.py
|
| ===================================================================
|
| --- tests/gclient_scm_test.py (revision 139694)
|
| +++ tests/gclient_scm_test.py (working copy)
|
| @@ -782,6 +782,7 @@
|
| 'GetRevisionDate',
|
| 'GetUsableRev',
|
| 'RunCommand',
|
| + 'UpdateSubmoduleConfig',
|
| 'cleanup',
|
| 'diff',
|
| 'pack',
|
| @@ -816,8 +817,13 @@
|
| expectation = ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
|
| 'Fast-forward\n a | 1 +\n b | 1 +\n'
|
| ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
|
| + '________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n\n'
|
| '________ running \'git reset --hard origin/master\' in \'%s\'\n'
|
| - 'HEAD is now at a7142dc Personalized\n') % join(self.root_dir, '.')
|
| + 'HEAD is now at a7142dc Personalized\n') % (
|
| + self.root_dir, join(self.root_dir, '.'))
|
| self.assertTrue(sys.stdout.getvalue().startswith(expectation))
|
| sys.stdout.close()
|
|
|
| @@ -838,9 +844,13 @@
|
| ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
|
| 'Fast-forward\n a | 1 +\n b | 1 +\n'
|
| ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
|
| + '________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n\n'
|
| '________ running \'git reset --hard origin/master\' in \'%s\'\n'
|
| - 'HEAD is now at a7142dc Personalized\n') %
|
| - join(self.root_dir, '.'))
|
| + 'HEAD is now at a7142dc Personalized\n') % (
|
| + self.root_dir, join(self.root_dir, '.')))
|
|
|
| def testRevertModified(self):
|
| if not self.enabled:
|
| @@ -863,8 +873,13 @@
|
| expectation = ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
|
| 'Fast-forward\n a | 1 +\n b | 1 +\n'
|
| ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
|
| + '________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n\n'
|
| '________ running \'git reset --hard origin/master\' in \'%s\'\n'
|
| - 'HEAD is now at a7142dc Personalized\n') % join(self.root_dir, '.')
|
| + 'HEAD is now at a7142dc Personalized\n') % (
|
| + self.root_dir, join(self.root_dir, '.'))
|
| self.assertTrue(sys.stdout.getvalue().startswith(expectation))
|
| sys.stdout.close()
|
|
|
| @@ -893,8 +908,13 @@
|
| expectation = ('\n_____ . at refs/heads/master\nUpdating 069c602..a7142dc\n'
|
| 'Fast-forward\n a | 1 +\n b | 1 +\n'
|
| ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n\n'
|
| + '________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n\n'
|
| '________ running \'git reset --hard origin/master\' in \'%s\'\n'
|
| - 'HEAD is now at a7142dc Personalized\n') % join(self.root_dir, '.')
|
| + 'HEAD is now at a7142dc Personalized\n') % (
|
| + self.root_dir, join(self.root_dir, '.'))
|
| self.assertTrue(sys.stdout.getvalue().startswith(expectation))
|
| sys.stdout.close()
|
|
|
| @@ -949,7 +969,11 @@
|
| self.checkstdout(
|
| '\n_____ . at refs/heads/master\n'
|
| 'Updating 069c602..a7142dc\nFast-forward\n a | 1 +\n b | 1 +\n'
|
| - ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n')
|
| + ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n'
|
| + '\n________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n' % self.root_dir)
|
|
|
| def testUpdateReset(self):
|
| if not self.enabled:
|
| @@ -976,7 +1000,11 @@
|
| '\n_____ . at refs/heads/master\n'
|
| 'Updating 069c602..a7142dc\nFast-forward\n a | 1 +\n b | 1 +\n'
|
| ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n'
|
| - % join(self.root_dir, '.'))
|
| + '\n________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n' % (
|
| + join(self.root_dir, '.'), self.root_dir))
|
|
|
| def testUpdateResetDeleteUnversionedTrees(self):
|
| if not self.enabled:
|
| @@ -1004,8 +1032,12 @@
|
| '\n_____ . at refs/heads/master\n'
|
| 'Updating 069c602..a7142dc\nFast-forward\n a | 1 +\n b | 1 +\n'
|
| ' 2 files changed, 2 insertions(+), 0 deletions(-)\n\n'
|
| - '\n_____ removing unversioned directory dir/\n' % join(self.root_dir,
|
| - '.'))
|
| + '\n________ running \'git submodule --quiet foreach git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore || git config -f '
|
| + '$toplevel/.git/config submodule.$name.ignore dirty\' in '
|
| + '\'%s\'\n'
|
| + '\n_____ removing unversioned directory dir/\n' % (
|
| + join(self.root_dir, '.'), self.root_dir))
|
|
|
| def testUpdateUnstagedConflict(self):
|
| if not self.enabled:
|
|
|