tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-13 14:07:20 +00:00
Code Releases Activity

The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true (#3246)

Browse Source 
Executed go fmt

getEngine() not handles DB parameters (#2972) (#2974)

Uses .AllCols() for Update in updateMirror()

Spanish traslation removed

Fixed a wrong way to ommit the --prune option in process.ExecDir() for MirrorUpdate function
This commit is contained in:
Pablo Saavedra
2016-07-09 07:22:28 +02:00
committed by 无闻
parent 467d7dacb6
commit 98b152030d
9 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
models/repo.go
View File

@ -558,6 +558,8 @@ type Mirror struct {
NextUpdateUnix int64
address string `xorm:"-"`
EnablePrune bool `xorm:"NOT NULL DEFAULT true"`
}
func (m *Mirror) BeforeInsert() {
@ -656,7 +658,7 @@ func GetMirror(repoId int64) (*Mirror, error) {
}
func updateMirror(e Engine, m *Mirror) error {
_, err := e.Id(m.ID).Update(m)
_, err := e.Id(m.ID).AllCols().Update(m)
return err
}
@ -746,9 +748,10 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
if opts.IsMirror {
if _, err = x.InsertOne(&Mirror{
RepoID: repo.ID,
Interval: 24,
NextUpdate: time.Now().Add(24 * time.Hour),
RepoID: repo.ID,
Interval: 24,
EnablePrune: true,
NextUpdate: time.Now().Add(24 * time.Hour),
}); err != nil {
return repo, fmt.Errorf("InsertOne: %v", err)
}
@ -1680,10 +1683,16 @@ func MirrorUpdate() {
}
repoPath := m.Repo.RepoPath()
var gitArgs = []string{"remote", "update"}
if m.EnablePrune {
gitArgs = []string{"remote", "update", "--prune"}
}
if _, stderr, err := process.ExecDir(
time.Duration(setting.Git.Timeout.Mirror)*time.Second,
repoPath, fmt.Sprintf("MirrorUpdate: %s", repoPath),
"git", "remote", "update", "--prune"); err != nil {
"git", gitArgs...); err != nil {
desc := fmt.Sprintf("Fail to update mirror repository(%s): %s", repoPath, stderr)
log.Error(4, desc)
if err = CreateRepositoryNotice(desc); err != nil {