Merge ~smoser/usd-importer:no-more-run into usd-importer:master

[Scott Moser]

[Nish Aravamudan (nacc)]

review: Approve

diff --git a/usd/GitRepository.py b/usd/GitRepository.py
index e80750a..0b71229 100644
--- a/usd/GitRepository.py
+++ b/usd/GitRepository.py
@@ -652,14 +652,9 @@ class USDGitRepository:
         self.clean_repository_state()
 
         # relies on this API being present, handle error if not?
-        cp = subprocess.run(
-             ['git', 'dsc-commit', '--tree-only', srcpkg.dsc_pathname],
-             stdout=subprocess.PIPE,
-             stderr=subprocess.DEVNULL,
-             universal_newlines=True,
-             check=True,
-             env=self._env)
-        import_tree_hash = cp.stdout.strip()
+        cp = run(['git', 'dsc-commit', '--tree-only', srcpkg.dsc_pathname],
+                 env=self._env)
+        import_tree_hash = cp.stdout.decode().strip()
         logging.info('Imported version %s as tree %s',
                      spi.version, import_tree_hash
                     )
@@ -860,18 +855,11 @@ class USDGitRepository:
                             )
                 sys.exit(1)
             else:
+                upload_parent_commit = str(upload_tag.peel().id)
                 if publish_parent_commit is not None:
                     try:
-                        subprocess.run(
-                             ['git', 'merge-base', '--is-ancestor',
-                              publish_parent_commit,
-                              str(upload_tag.peel().id)
-                             ],
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.DEVNULL,
-                             universal_newlines=True,
-                             check=True,
-                             env=self._env)
+                        run(['git', 'merge-base', '--is-ancestor',
+                             publish_parent_commit, upload_parent_commit])
                         publish_parent_commit = None
                     except subprocess.CalledProcessError as e:
                         if e.returncode != 1:
@@ -879,23 +867,13 @@ class USDGitRepository:
 
                 if changelog_parent_commit is not None:
                     try:
-                        subprocess.run(
-                             ['git', 'merge-base', '--is-ancestor',
-                              changelog_parent_commit,
-                              str(upload_tag.peel().id)
-                             ],
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.DEVNULL,
-                             universal_newlines=True,
-                             check=True,
-                             env=self._env)
+                        run(['git', 'merge-base', '--is-ancestor',
+                             changelog_parent_commit, upload_parent_commit])
                         changelog_parent_commit = None
                     except subprocess.CalledProcessError as e:
                         if e.returncode != 1:
                             raise
 
-                upload_parent_commit = str(upload_tag.peel().id)
-
         self.commit_import(
             spi,
             import_tree_hash,