commit 2fe99e8820a84f545ad45d53921dc94b8bc9d4f3
author Shawn O. Pearce <sop@google.com> Fri Oct 26 12:27:36 2012 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 26 12:27:36 2012 -0700
tree 2f5707377de43d2eef4ae7cbc3c47cfeefccbbff
parent bed45f940072e6383bf219bc315a65692e93d682
parent 80d2ceb22267b7dc61b107934ff5264b6439a785

Merge "repo selfupdate: Fix _PostRepoUpgrade takes 2 arguments"

subcmds/init.py

diff --git a/subcmds/init.py b/subcmds/init.py
index b6b9807..e56b922 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -313,6 +313,21 @@
       # We store the depth in the main manifest project.
       self.manifest.manifestProject.config.SetString('repo.depth', depth)
 
+  def _DisplayResult(self):
+    if self.manifest.IsMirror:
+      init_type = 'mirror '
+    else:
+      init_type = ''
+
+    print ''
+    print 'repo %shas been initialized in %s' % (init_type, self.manifest.topdir)
+
+    current_dir = os.getcwd()
+    if current_dir != self.manifest.topdir:
+      print 'If this is not the directory in which you want to initialize repo, please run:'
+      print '   rm -r %s/.repo' % self.manifest.topdir
+      print 'and try again.'
+
   def Execute(self, opt, args):
     git_require(MIN_GIT_VERSION, fail=True)
 
@@ -329,10 +344,4 @@
 
     self._ConfigureDepth(opt)
 
-    if self.manifest.IsMirror:
-      init_type = 'mirror '
-    else:
-      init_type = ''
-
-    print ''
-    print 'repo %sinitialized in %s' % (init_type, self.manifest.topdir)
+    self._DisplayResult()