Skip to content

Commit 027591a

Browse files
ethantkoeniglunny
ethantkoenig
authored and
lunny
committed
Redirects for renamed repos (#807)
* Redirects for renamed repos * Remove unused phrase from locales
1 parent e86d935 commit 027591a

29 files changed

+127
-27
lines changed

‎models/error.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,22 @@ func (err ErrRepoAlreadyExist) Error() string {
408408
return fmt.Sprintf("repository already exists [uname: %s, name: %s]", err.Uname, err.Name)
409409
}
410410

411+
// ErrRepoRedirectNotExist represents a "RepoRedirectNotExist" kind of error.
412+
type ErrRepoRedirectNotExist struct {
413+
OwnerID int64
414+
RepoName string
415+
}
416+
417+
// IsErrRepoRedirectNotExist check if an error is an ErrRepoRedirectNotExist
418+
func IsErrRepoRedirectNotExist(err error) bool {
419+
_, ok := err.(ErrRepoRedirectNotExist)
420+
return ok
421+
}
422+
423+
func (err ErrRepoRedirectNotExist) Error() string {
424+
return fmt.Sprintf("repository redirect does not exist [uid: %d, name: %s]", err.OwnerID, err.RepoName)
425+
}
426+
411427
// ErrInvalidCloneAddr represents a "InvalidCloneAddr" kind of error.
412428
type ErrInvalidCloneAddr struct {
413429
IsURLError bool

‎models/models.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ func init() {
109109
new(LFSMetaObject),
110110
new(TwoFactor),
111111
new(RepoUnit),
112+
new(RepoRedirect),
112113
)
113114

114115
gonicNames := []string{"SSL", "UID"}

‎models/repo.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,6 +1054,9 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) {
10541054
if _, err = e.Insert(repo); err != nil {
10551055
return err
10561056
}
1057+
if err = deleteRepoRedirect(e, u.ID, repo.Name); err != nil {
1058+
return err
1059+
}
10571060

10581061
// insert units for repo
10591062
var units = make([]RepoUnit, 0, len(defaultRepoUnits))

‎models/repo_redirect.go

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Copyright 2017 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package models
6+
7+
import "strings"
8+
9+
// RepoRedirect represents that a repo name should be redirected to another
10+
type RepoRedirect struct {
11+
ID int64 `xorm:"pk autoincr"`
12+
OwnerID int64 `xorm:"UNIQUE(s)"`
13+
LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
14+
RedirectRepoID int64 // repoID to redirect to
15+
}
16+
17+
// LookupRepoRedirect look up if a repository has a redirect name
18+
func LookupRepoRedirect(ownerID int64, repoName string) (int64, error) {
19+
repoName = strings.ToLower(repoName)
20+
redirect := &RepoRedirect{OwnerID: ownerID, LowerName: repoName}
21+
if has, err := x.Get(redirect); err != nil {
22+
return 0, err
23+
} else if !has {
24+
return 0, ErrRepoRedirectNotExist{OwnerID: ownerID, RepoName: repoName}
25+
}
26+
return redirect.RedirectRepoID, nil
27+
}
28+
29+
// NewRepoRedirect create a new repo redirect
30+
func NewRepoRedirect(ownerID, repoID int64, oldRepoName, newRepoName string) error {
31+
oldRepoName = strings.ToLower(oldRepoName)
32+
newRepoName = strings.ToLower(newRepoName)
33+
sess := x.NewSession()
34+
defer sess.Close()
35+
36+
if err := sess.Begin(); err != nil {
37+
return err
38+
}
39+
40+
if err := deleteRepoRedirect(sess, ownerID, newRepoName); err != nil {
41+
sess.Rollback()
42+
return err
43+
}
44+
45+
if _, err := sess.Insert(&RepoRedirect{
46+
OwnerID: ownerID,
47+
LowerName: oldRepoName,
48+
RedirectRepoID: repoID,
49+
}); err != nil {
50+
sess.Rollback()
51+
return err
52+
}
53+
return sess.Commit()
54+
}
55+
56+
// deleteRepoRedirect delete any redirect from the specified repo name to
57+
// anything else
58+
func deleteRepoRedirect(e Engine, ownerID int64, repoName string) error {
59+
repoName = strings.ToLower(repoName)
60+
_, err := e.Delete(&RepoRedirect{OwnerID: ownerID, LowerName: repoName})
61+
return err
62+
}

‎modules/context/repo.go

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,26 @@ func earlyResponseForGoGetMeta(ctx *Context) {
133133
})))
134134
}
135135

136+
// RedirectToRepo redirect to a differently-named repository
137+
func RedirectToRepo(ctx *Context, redirectRepoID int64) {
138+
ownerName := ctx.Params(":username")
139+
previousRepoName := ctx.Params(":reponame")
140+
141+
repo, err := models.GetRepositoryByID(redirectRepoID)
142+
if err != nil {
143+
ctx.Handle(500, "GetRepositoryByID", err)
144+
return
145+
}
146+
147+
redirectPath := strings.Replace(
148+
ctx.Req.URL.Path,
149+
fmt.Sprintf("%s/%s", ownerName, previousRepoName),
150+
fmt.Sprintf("%s/%s", ownerName, repo.Name),
151+
1,
152+
)
153+
ctx.Redirect(redirectPath)
154+
}
155+
136156
// RepoAssignment returns a macaron to handle repository assignment
137157
func RepoAssignment(args ...bool) macaron.Handler {
138158
return func(ctx *Context) {
@@ -176,11 +196,18 @@ func RepoAssignment(args ...bool) macaron.Handler {
176196
repo, err := models.GetRepositoryByName(owner.ID, repoName)
177197
if err != nil {
178198
if models.IsErrRepoNotExist(err) {
179-
if ctx.Query("go-get") == "1" {
180-
earlyResponseForGoGetMeta(ctx)
181-
return
199+
redirectRepoID, err := models.LookupRepoRedirect(owner.ID, repoName)
200+
if err == nil {
201+
RedirectToRepo(ctx, redirectRepoID)
202+
} else if models.IsErrRepoRedirectNotExist(err) {
203+
if ctx.Query("go-get") == "1" {
204+
earlyResponseForGoGetMeta(ctx)
205+
return
206+
}
207+
ctx.Handle(404, "GetRepositoryByName", err)
208+
} else {
209+
ctx.Handle(500, "LookupRepoRedirect", err)
182210
}
183-
ctx.Handle(404, "GetRepositoryByName", err)
184211
} else {
185212
ctx.Handle(500, "GetRepositoryByName", err)
186213
}

‎options/locale/locale_bg-BG.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Синхр. сега
636636
settings.mirror_sync_in_progress=Синхронизация на огледалото е в ход, моля обновете страницата след минута.
637637
settings.site=Официален сайт
638638
settings.update_settings=Запази настройките
639-
settings.change_reponame_prompt=Тази промяна ще засегне връзките, които се отнасят до това хранилището.
640639
settings.advanced_settings=Разширени настройки
641640
settings.wiki_desc=Включи система за уики
642641
settings.use_internal_wiki=Използвай вградено уики

‎options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Provést synchronizaci
636636
settings.mirror_sync_in_progress=Synchronizace zrcadel probíhá, prosím načtěte znovu stránku přibližně za minutu.
637637
settings.site=Oficiální stránky
638638
settings.update_settings=Změnit nastavení
639-
settings.change_reponame_prompt=Tato změna ovlivní vztah odkazů k repositáři.
640639
settings.advanced_settings=Pokročilá nastavení
641640
settings.wiki_desc=Povolit systém Wiki
642641
settings.use_internal_wiki=Použít vestavěný systém Wiki

‎options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,6 @@ settings.sync_mirror=Jetzt synchronisieren
643643
settings.mirror_sync_in_progress=Mirror Synchronisierung läuft, bitte die Seite in ca. einer Minute neu laden.
644644
settings.site=Offizielle Webseite
645645
settings.update_settings=Einstellungen speichern
646-
settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich Links auf Repositories beziehen.
647646
settings.advanced_settings=Erweiterte Einstellungen
648647
settings.wiki_desc=Wiki einschalten
649648
settings.use_internal_wiki=Eingebautes Wiki verwenden

‎options/locale/locale_en-US.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ settings.sync_mirror = Sync Now
699699
settings.mirror_sync_in_progress = Mirror syncing is in progress, please refresh page in about a minute.
700700
settings.site = Official Site
701701
settings.update_settings = Update Settings
702-
settings.change_reponame_prompt = This change will affect how links relate to the repository.
703702
settings.advanced_settings = Advanced Settings
704703
settings.wiki_desc = Enable wiki system
705704
settings.use_internal_wiki = Use builtin wiki

‎options/locale/locale_es-ES.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ settings.sync_mirror=Sincronizar ahora
637637
settings.mirror_sync_in_progress=Sincronización de réplica en curso, por favor actualice la página en unos minutos.
638638
settings.site=Sitio oficial
639639
settings.update_settings=Actualizar configuración
640-
settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositorio.
641640
settings.advanced_settings=Ajustes avanzados
642641
settings.wiki_desc=Activar sistema de wiki
643642
settings.use_internal_wiki=Usar wiki integrada

‎options/locale/locale_fi-FI.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Sync Now
636636
settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
637637
settings.site=Virallinen sivusto
638638
settings.update_settings=Päivitä asetukset
639-
settings.change_reponame_prompt=Tämä muutos vaikuttaa siihen miten linkit liittyvät repoon.
640639
settings.advanced_settings=Lisäasetukset
641640
settings.wiki_desc=Enable wiki system
642641
settings.use_internal_wiki=Use builtin wiki

‎options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ settings.sync_mirror=Synchroniser maintenant
637637
settings.mirror_sync_in_progress=Synchronisation du miroir en cours, merci de rafraîchir la page dans une minute environ.
638638
settings.site=Site officiel
639639
settings.update_settings=Valider
640-
settings.change_reponame_prompt=Ce changement affectera comment les liens sont reliés avec le dépôt.
641640
settings.advanced_settings=Paramètres avancés
642641
settings.wiki_desc=Activer le wiki
643642
settings.use_internal_wiki=Utiliser le wiki interne

‎options/locale/locale_it-IT.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Sync Now
636636
settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
637637
settings.site=Sito Ufficiale
638638
settings.update_settings=Aggiorna Impostazioni
639-
settings.change_reponame_prompt=Questa modifica influirà i link al repository.
640639
settings.advanced_settings=Opzioni avanzate
641640
settings.wiki_desc=Enable wiki system
642641
settings.use_internal_wiki=Use builtin wiki

‎options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=今すぐ同期
636636
settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
637637
settings.site=公式サイト
638638
settings.update_settings=設定の更新
639-
settings.change_reponame_prompt=この変更はリンクがリポジトリに関連付ける方法に影響します。
640639
settings.advanced_settings=拡張設定
641640
settings.wiki_desc=Enable wiki system
642641
settings.use_internal_wiki=Use builtin wiki

‎options/locale/locale_ko-KR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ settings.sync_mirror=지금 동기화
637637
settings.mirror_sync_in_progress=미러 동기화 진행 중입니다. 약 1분 뒤에 페이지를 새로 고침 하세요.
638638
settings.site=공식 사이트
639639
settings.update_settings=설정 저장
640-
settings.change_reponame_prompt=이 변경은 이 저장소와 연관된 링크들에 영향을 줄 것입니다.
641640
settings.advanced_settings=고급 설정
642641
settings.wiki_desc=위키 시스템 활성화
643642
settings.use_internal_wiki=내장 위키 사용

‎options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Sinhronizēt tagad
636636
settings.mirror_sync_in_progress=Notiek spoguļa sinhronizācija, uzgaidiet aptuveni minūti un atjaunojiet lapu.
637637
settings.site=Oficiālā mājas lapa
638638
settings.update_settings=Mainīt iestatījumus
639-
settings.change_reponame_prompt=Šī izmaiņa ietekmēs saites, kas ir saistītas ar šo repozitoriju.
640639
settings.advanced_settings=Papildu iestatījumi
641640
settings.wiki_desc=Iespējot vikivietnes
642641
settings.use_internal_wiki=Izmantot iebūvēto vikivietni

‎options/locale/locale_nl-NL.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ settings.sync_mirror=Sync Now
637637
settings.mirror_sync_in_progress=Kopie synchronisatie is bezig, vernieuw de pagina over ongeveer een minuut.
638638
settings.site=Officiële site
639639
settings.update_settings=Instellingen bewerken
640-
settings.change_reponame_prompt=Deze verandering zal gevolgen hebben voor hoe links zich verhouden tot de repository.
641640
settings.advanced_settings=Geavanceerde opties
642641
settings.wiki_desc=Enable wiki system
643642
settings.use_internal_wiki=Use builtin wiki

‎options/locale/locale_pl-PL.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Synchronizuj teraz
636636
settings.mirror_sync_in_progress=Synchronizacja kopii lustrzanej jest w toku, odśwież stronę w ciągu minuty.
637637
settings.site=Oficjalna Strona
638638
settings.update_settings=Aktualizuj ustawienia
639-
settings.change_reponame_prompt=Zmiana nazwy repozytorium wpłynie na linki do niego.
640639
settings.advanced_settings=Ustawienia zaawansowane
641640
settings.wiki_desc=Włącz system wiki
642641
settings.use_internal_wiki=Użyj wbudowanego wiki

‎options/locale/locale_pt-BR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ settings.sync_mirror=Sincronizar agora
637637
settings.mirror_sync_in_progress=A sincronização do mirror está em andamento, por favor atualize a página em aproximadamente um minuto.
638638
settings.site=Site oficial
639639
settings.update_settings=Atualizar configurações
640-
settings.change_reponame_prompt=Esta mudança irá afetar os links para este repositório.
641640
settings.advanced_settings=Configurações avançadas
642641
settings.wiki_desc=Habilitar sistema de wiki
643642
settings.use_internal_wiki=Usar wiki nativa

‎options/locale/locale_ru-RU.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ settings.sync_mirror=Синхронизировать
644644
settings.mirror_sync_in_progress=Выполняется синхронизация Зеркала, пожалуйста, обновите эту страницу через минуту.
645645
settings.site=Официальный сайт
646646
settings.update_settings=Обновить настройки
647-
settings.change_reponame_prompt=Это изменение повлияет на отношения ссылок к этому репозиторию.
648647
settings.advanced_settings=Расширенные настройки
649648
settings.wiki_desc=Включить систему Wiki
650649
settings.use_internal_wiki=Использовать встроенную wiki

‎options/locale/locale_sr-SP.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Изврши синхронизацију сада
636636
settings.mirror_sync_in_progress=Синхронизација је у току, молимо вас да освежите страницу ускоро.
637637
settings.site=Званични сајт
638638
settings.update_settings=Примени промене
639-
settings.change_reponame_prompt=Ова промена ће утицати на однос линкова на спремиште.
640639
settings.advanced_settings=Напредна подешавања
641640
settings.wiki_desc=Омогући систем вики
642641
settings.use_internal_wiki=Користи уграђен вики

‎options/locale/locale_sv-SE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Synkronisera nu
636636
settings.mirror_sync_in_progress=Spegningssynkronisering pågår, vänligen ladda om sidan om cirka en minut.
637637
settings.site=Officiell webbplats
638638
settings.update_settings=Uppdatera inställningar
639-
settings.change_reponame_prompt=Denna ändring kommer att påverka hur länkar relaterar till detta repo.
640639
settings.advanced_settings=Advancerade Inställningar
641640
settings.wiki_desc=Aktivera wikisystem
642641
settings.use_internal_wiki=Använd inbyggd wiki

‎options/locale/locale_tr-TR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ settings.sync_mirror=Sync Now
636636
settings.mirror_sync_in_progress=Mirror syncing is in progress, please refresh page in about a minute.
637637
settings.site=Resmi Web Sitesi
638638
settings.update_settings=Ayarları Güncelle
639-
settings.change_reponame_prompt=Bu değişiklik, bağlantıların depoyla olan ilişkisini etkileyecektir.
640639
settings.advanced_settings=Gelişmiş Ayarlar
641640
settings.wiki_desc=Viki sıstemini etkinleştir
642641
settings.use_internal_wiki=Use builtin wiki

‎options/locale/locale_zh-CN.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,6 @@ settings.sync_mirror=立即同步
650650
settings.mirror_sync_in_progress=镜像同步请求已经生效，请稍后刷新页面。
651651
settings.site=官方网站
652652
settings.update_settings=更新仓库设置
653-
settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接
654653
settings.advanced_settings=高级设置
655654
settings.wiki_desc=启用 Wiki 系统
656655
settings.use_internal_wiki=使用内置 Wiki 系统

‎options/locale/locale_zh-HK.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@ settings.sync_mirror=立即同步
645645
settings.mirror_sync_in_progress=鏡像同步正在進行中，請大約一分鐘後刷新頁面。
646646
settings.site=官方網站
647647
settings.update_settings=更新儲存庫設定
648-
settings.change_reponame_prompt=該操作將會影響到所有與該儲存庫有關的鏈接
649648
settings.advanced_settings=高級設定
650649
settings.wiki_desc=啓用 Wiki 系統
651650
settings.use_internal_wiki=使用內建 wiki

‎options/locale/locale_zh-TW.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@ settings.sync_mirror=立即同步
645645
settings.mirror_sync_in_progress=鏡像同步正在進行中，請大約一分鐘後刷新頁面。
646646
settings.site=官方網站
647647
settings.update_settings=更新儲存庫設定
648-
settings.change_reponame_prompt=該操作將會影響到所有與該儲存庫有關的鏈接
649648
settings.advanced_settings=高級設定
650649
settings.wiki_desc=啓用 Wiki 系統
651650
settings.use_internal_wiki=使用內建 wiki

‎routers/api/v1/api.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ func repoAssignment() macaron.Handler {
5252
repo, err := models.GetRepositoryByName(owner.ID, repoName)
5353
if err != nil {
5454
if models.IsErrRepoNotExist(err) {
55-
ctx.Status(404)
55+
redirectRepoID, err := models.LookupRepoRedirect(owner.ID, repoName)
56+
if err == nil {
57+
context.RedirectToRepo(ctx.Context, redirectRepoID)
58+
} else if models.IsErrRepoRedirectNotExist(err) {
59+
ctx.Status(404)
60+
} else {
61+
ctx.Error(500, "LookupRepoRedirect", err)
62+
}
5663
} else {
5764
ctx.Error(500, "GetRepositoryByName", err)
5865
}

‎routers/repo/setting.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
6868
return
6969
}
7070

71+
err := models.NewRepoRedirect(ctx.Repo.Owner.ID, repo.ID, repo.Name, newRepoName)
72+
if err != nil {
73+
ctx.Handle(500, "NewRepoRedirect", err)
74+
}
75+
7176
log.Trace("Repository name changed: %s/%s -> %s", ctx.Repo.Owner.Name, repo.Name, newRepoName)
7277
}
7378
// In case it's just a case change.

‎templates/repo/settings/options.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{{.CsrfTokenHtml}}
1515
<input type="hidden" name="action" value="update">
1616
<div class="required field {{if .Err_RepoName}}error{{end}}">
17-
<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}<span class="text red hide" id="repo-name-change-prompt"> {{.i18n.Tr "repo.settings.change_reponame_prompt"}}</span></label>
17+
<label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
1818
<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
1919
</div>
2020
<div class="field {{if .Err_Description}}error{{end}}">

0 commit comments

Comments
 (0)