Just roundtrip the password

models/repo_mirror.go

@@ -154,6 +154,18 @@ func (m *Mirror) Username() string {
  return u.User.Username()
 }
 
+// Password returns the mirror address password
+func (m *Mirror) Password() string {
+ m.readAddress()
+ u, err := url.Parse(m.address)
+ if err != nil {
+ // this shouldn't happen but if it does return ""
+ return ""
+ }
+ password, _ := u.User.Password()
+ return password
+}
+
 // SaveAddress writes new address to Git repository config.
 func (m *Mirror) SaveAddress(addr string) error {
  repoPath := m.Repo.RepoPath()

routers/repo/setting.go

@@ -172,12 +172,8 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
  return
  }
 
- if form.MirrorUsername != "" {
- password := form.MirrorPassword
- if password == "" && oldURL != nil && u.Hostname() == oldURL.Hostname() {
- password, _ = oldURL.User.Password()
- }
- u.User = url.UserPassword(form.MirrorUsername, password)
+ if form.MirrorUsername != "" || form.MirrorPassword != "" {
+ u.User = url.UserPassword(form.MirrorUsername, form.MirrorPassword)
  }
 
  // Now use xurls

templates/repo/settings/options.tmpl

@@ -96,7 +96,7 @@
  <input class="fake" type="password">
  <div class="inline field {{if .Err_Auth}}error{{end}}">
  <label for="mirror_password">{{.i18n.Tr "password"}}</label>
- <input id="mirror_password" name="mirror_password" type="password" value="">
+ <input id="mirror_password" name="mirror_password" type="password" value="{{.Mirror.Password}}" {{if not .mirror_password}}data-need-clear="true"{{end}}>
  </div>
  </div>
  </div>