commit 20082a07cd83cc4cf11ce35566e2d20266c60997
author kbaclawski <kbaclawski@p4.invalid> Sat Feb 16 02:12:57 2013 +0000
committer kbaclawski <kbaclawski@p4.invalid> Sat Feb 16 02:12:57 2013 +0000
tree 4be5741f56696d1d070bc0462fc196e36ebc6fb3
parent db9183a3bd0abc3e0217d226db24e7001f3de8bf

Rename utils.utils to utils.misc to prevent Python from being confused.

Tested:
  N/A

PRESUBMIT=passed
R=asharif
DELTA=506  (234 added, 210 deleted, 62 changed)
OCL=59036-p2
RCL=59059-p2
RDATE=2012/03/12 13:50:53


P4 change: 42672835

v14/repo_to_repo.py

diff --git a/v14/repo_to_repo.py b/v14/repo_to_repo.py
index b7f94e4..744b24c 100755
--- a/v14/repo_to_repo.py
+++ b/v14/repo_to_repo.py
@@ -10,10 +10,11 @@
 import socket
 import sys
 import tempfile
+
 from automation.clients.helper import perforce
 from utils import command_executer
 from utils import logger
-from utils import utils
+from utils import misc
 
 
 def GetCanonicalMappings(mappings):
@@ -127,7 +128,7 @@
     self.mappings = mappings
 
   def PullSources(self):
-    with utils.WorkingDirectory(self._root_dir):
+    with misc.WorkingDirectory(self._root_dir):
       for mapping in self.mappings:
         remote_path, local_path = SplitMapping(mapping)
         command = 'svn co %s/%s %s' % (self.address, remote_path, local_path)
@@ -156,12 +157,12 @@
     self.gerrit = gerrit
 
   def _CloneSources(self):
-    with utils.WorkingDirectory(self._root_dir):
+    with misc.WorkingDirectory(self._root_dir):
       command = 'git clone %s .' % (self.address)
       return self._ce.RunCommand(command)
 
   def PullSources(self):
-    with utils.WorkingDirectory(self._root_dir):
+    with misc.WorkingDirectory(self._root_dir):
       ret = self._CloneSources()
       if ret: return ret
 
@@ -175,7 +176,7 @@
       return ret
 
   def SetupForPush(self):
-    with utils.WorkingDirectory(self._root_dir):
+    with misc.WorkingDirectory(self._root_dir):
       ret = self._CloneSources()
       logger.GetLogger().LogFatalIf(ret, 'Could not clone git repo %s.' %
                                     self.address)
@@ -197,7 +198,7 @@
       return ret
 
   def PushSources(self, commit_message, dry_run=False):
-    with utils.WorkingDirectory(self._root_dir):
+    with misc.WorkingDirectory(self._root_dir):
       push_args = ''
       if dry_run:
         push_args += ' -n '
@@ -223,7 +224,7 @@
     if not self.mappings:
       self._RsyncExcludingRepoDirs(self._root_dir, root_dir)
       return
-    with utils.WorkingDirectory(self._root_dir):
+    with misc.WorkingDirectory(self._root_dir):
       for mapping in self.mappings:
         remote_path, local_path = SplitMapping(mapping)
         remote_path.rstrip('...')