summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-03-03 13:52:20 -0800
committerShawn O. Pearce <sop@google.com>2009-03-03 13:52:20 -0800
commit6a5644d392069b67f17c8ce6cb10f07cce71cc1c (patch)
treee53999c93913da0558d4c247e5bb726a6c02ce2f
parentfe0867595635b0dc007088053c5901331ac92536 (diff)
downloadgit-repo-6a5644d392069b67f17c8ce6cb10f07cce71cc1c.tar.gz
Get rid of the horrible android import work around hack
Months ago when the Android Open Source Project launched we had some import errors that had to be fixed and worked over. These hacks were here to help users update their clients to newer versions of the imported code. Its very likely all clients have either been deleted, or have been updated and have the fixed imports. So we don't need this hack in repo anymore. If a very ancient client still existed, it would need to be created from scratch anyway, due to the Android cupcake branch merging into master and the manifest changes not being able to be handled correctly by repo. A new client wouldn't have the incorrectly imported code in it, and thus wouldn't need this hack. Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--project.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/project.py b/project.py
index b1c0439a..adb7f669 100644
--- a/project.py
+++ b/project.py
@@ -529,7 +529,6 @@ class Project(object):
529 return False 529 return False
530 530
531 if self.worktree: 531 if self.worktree:
532 self._RepairAndroidImportErrors()
533 self._InitMRef() 532 self._InitMRef()
534 else: 533 else:
535 self._InitMirrorHead() 534 self._InitMirrorHead()
@@ -546,30 +545,6 @@ class Project(object):
546 for file in self.copyfiles: 545 for file in self.copyfiles:
547 file._Copy() 546 file._Copy()
548 547
549 def _RepairAndroidImportErrors(self):
550 if self.name in ['platform/external/iptables',
551 'platform/external/libpcap',
552 'platform/external/tcpdump',
553 'platform/external/webkit',
554 'platform/system/wlan/ti']:
555 # I hate myself for doing this...
556 #
557 # In the initial Android 1.0 release these projects were
558 # shipped, some users got them, and then the history had
559 # to be rewritten to correct problems with their imports.
560 # The 'android-1.0' tag may still be pointing at the old
561 # history, so we need to drop the tag and fetch it again.
562 #
563 try:
564 remote = self.GetRemote(self.remote.name)
565 relname = remote.ToLocal(R_HEADS + 'release-1.0')
566 tagname = R_TAGS + 'android-1.0'
567 if self._revlist(not_rev(relname), tagname):
568 cmd = ['fetch', remote.name, '+%s:%s' % (tagname, tagname)]
569 GitCommand(self, cmd, bare = True).Wait()
570 except GitError:
571 pass
572
573 def Sync_LocalHalf(self): 548 def Sync_LocalHalf(self):
574 """Perform only the local IO portion of the sync process. 549 """Perform only the local IO portion of the sync process.
575 Network access is not required. 550 Network access is not required.