From b6f671b90124e0326e32793bbaeb59eaa43b4c2f Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Wed, 25 Jan 2012 15:30:03 -0500
Subject: [PATCH] gofix: update go1pkgrename for subrepositories

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5576044
---
 src/cmd/gofix/go1pkgrename.go      | 26 ++++++++++++++++++++++++++
 src/cmd/gofix/go1pkgrename_test.go |  4 ++++
 2 files changed, 30 insertions(+)

diff --git a/src/cmd/gofix/go1pkgrename.go b/src/cmd/gofix/go1pkgrename.go
index 91e3cb1caa8..7dc952dfad2 100644
--- a/src/cmd/gofix/go1pkgrename.go
+++ b/src/cmd/gofix/go1pkgrename.go
@@ -50,6 +50,32 @@ var go1PackageRenames = []struct{ old, new string }{
 	{"utf16", "unicode/utf16"},
 	{"utf8", "unicode/utf8"},
 	{"xml", "encoding/xml"},
+
+	// go.crypto sub-repository
+	{"crypto/bcrypt", "code.google.com/p/go.crypto/bcrypt"},
+	{"crypto/blowfish", "code.google.com/p/go.crypto/blowfish"},
+	{"crypto/cast5", "code.google.com/p/go.crypto/cast5"},
+	{"crypto/md4", "code.google.com/p/go.crypto/md4"},
+	{"crypto/ocsp", "code.google.com/p/go.crypto/ocsp"},
+	{"crypto/openpgp", "code.google.com/p/go.crypto/openpgp"},
+	{"crypto/openpgp/armor", "code.google.com/p/go.crypto/openpgp/armor"},
+	{"crypto/openpgp/elgamal", "code.google.com/p/go.crypto/openpgp/elgamal"},
+	{"crypto/openpgp/errors", "code.google.com/p/go.crypto/openpgp/errors"},
+	{"crypto/openpgp/packet", "code.google.com/p/go.crypto/openpgp/packet"},
+	{"crypto/openpgp/s2k", "code.google.com/p/go.crypto/openpgp/s2k"},
+	{"crypto/ripemd160", "code.google.com/p/go.crypto/ripemd160"},
+	{"crypto/twofish", "code.google.com/p/go.crypto/twofish"},
+	{"crypto/xtea", "code.google.com/p/go.crypto/xtea"},
+	{"exp/ssh", "code.google.com/p/go.crypto/ssh"},
+
+	// go.net sub-repository
+	{"net/dict", "code.google.com/p/go.net/dict"},
+	{"net/websocket", "code.google.com/p/go.net/websocket"},
+	{"exp/spdy", "code.google.com/p/go.net/spdy"},
+
+	// go.codereview sub-repository
+	{"encoding/git85", "code.google.com/p/go.codereview/git85"},
+	{"patch", "code.google.com/p/go.codereview/patch"},
 }
 
 var go1PackageNameRenames = []struct{ newPath, old, new string }{
diff --git a/src/cmd/gofix/go1pkgrename_test.go b/src/cmd/gofix/go1pkgrename_test.go
index 32d659653b6..736e7ed7fc7 100644
--- a/src/cmd/gofix/go1pkgrename_test.go
+++ b/src/cmd/gofix/go1pkgrename_test.go
@@ -41,6 +41,8 @@ import (
 	"utf16"
 	"utf8"
 	"xml"
+
+	"crypto/bcrypt"
 )
 `,
 		Out: `package main
@@ -73,6 +75,8 @@ import (
 	"text/template/parse"
 	"unicode/utf16"
 	"unicode/utf8"
+
+	"code.google.com/p/go.crypto/bcrypt"
 )
 `,
 	},