remove debug info

release/v1.15
Lunny Xiao 2014-07-05 10:37:29 +08:00
parent 3c6da63216
commit baa255e899
1 changed files with 3 additions and 12 deletions

View File

@ -632,7 +632,6 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
return err return err
}*/ }*/
//fmt.Println("0")
sess := x.NewSession() sess := x.NewSession()
defer sess.Close() defer sess.Close()
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
@ -641,16 +640,15 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
access := &Access{ access := &Access{
RepoName: newUser.LowerName + "/" + repo.LowerName, RepoName: newUser.LowerName + "/" + repo.LowerName,
UserName: newUser.LowerName,
} }
//fmt.Println("1")
sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName) sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName)
_, err = sess.And("user_name = ?", u.LowerName).Update(&Access{UserName: newUser.LowerName}) _, err = sess.And("user_name = ?", u.LowerName).Update(&Access{UserName: newUser.LowerName})
if err != nil { if err != nil {
sess.Rollback() sess.Rollback()
return err return err
} }
//fmt.Println("2")
_, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).Update(access) _, err = sess.Where("repo_name = ?", u.LowerName+"/"+repo.LowerName).Update(access)
if err != nil { if err != nil {
sess.Rollback() sess.Rollback()
@ -668,7 +666,6 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
} }
}*/ }*/
//fmt.Println("3")
// Update repository. // Update repository.
repo.OwnerId = newUser.Id repo.OwnerId = newUser.Id
if _, err := sess.Id(repo.Id).Update(repo); err != nil { if _, err := sess.Id(repo.Id).Update(repo); err != nil {
@ -676,22 +673,19 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
return err return err
} }
//fmt.Println("4")
// Update user repository number. // Update user repository number.
rawSql := "UPDATE `user` SET num_repos = num_repos + 1 WHERE id = ?" rawSql := "UPDATE `user` SET num_repos = num_repos + 1 WHERE id = ?"
if _, err = sess.Exec(rawSql, newUser.Id); err != nil { if _, err = sess.Exec(rawSql, newUser.Id); err != nil {
sess.Rollback() sess.Rollback()
return err return err
} }
//fmt.Println("5")
rawSql = "UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?" rawSql = "UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?"
if _, err = sess.Exec(rawSql, u.Id); err != nil { if _, err = sess.Exec(rawSql, u.Id); err != nil {
sess.Rollback() sess.Rollback()
return err return err
} }
//fmt.Println("6")
// Add watch of new owner to repository. // Add watch of new owner to repository.
if !IsWatching(newUser.Id, repo.Id) { if !IsWatching(newUser.Id, repo.Id) {
if err = WatchRepo(newUser.Id, repo.Id, true); err != nil { if err = WatchRepo(newUser.Id, repo.Id, true); err != nil {
@ -700,20 +694,17 @@ func TransferOwnership(u *User, newOwner string, repo *Repository) (err error) {
} }
} }
//fmt.Println("7")
if err = TransferRepoAction(u, newUser, repo); err != nil { if err = TransferRepoAction(u, newUser, repo); err != nil {
sess.Rollback() sess.Rollback()
return err return err
} }
//fmt.Println("8")
// Change repository directory name. // Change repository directory name.
if err = os.Rename(RepoPath(u.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil { if err = os.Rename(RepoPath(u.Name, repo.Name), RepoPath(newUser.Name, repo.Name)); err != nil {
sess.Rollback() sess.Rollback()
return err return err
} }
//fmt.Println("9")
return sess.Commit() return sess.Commit()
} }