Du kan inte välja fler än 25 ämnen Ämnen måste starta med en bokstav eller siffra, kan innehålla bindestreck ('-') och vara max 35 tecken långa.

merge.go 21KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547
  1. // Copyright 2019 The Gitea Authors.
  2. // All rights reserved.
  3. // Use of this source code is governed by a MIT-style
  4. // license that can be found in the LICENSE file.
  5. package pull
  6. import (
  7. "bufio"
  8. "bytes"
  9. "fmt"
  10. "io/ioutil"
  11. "os"
  12. "path/filepath"
  13. "regexp"
  14. "strings"
  15. "time"
  16. "code.gitea.io/gitea/models"
  17. "code.gitea.io/gitea/modules/cache"
  18. "code.gitea.io/gitea/modules/git"
  19. "code.gitea.io/gitea/modules/log"
  20. "code.gitea.io/gitea/modules/notification"
  21. "code.gitea.io/gitea/modules/references"
  22. "code.gitea.io/gitea/modules/setting"
  23. "code.gitea.io/gitea/modules/timeutil"
  24. issue_service "code.gitea.io/gitea/services/issue"
  25. "github.com/mcuadros/go-version"
  26. )
  27. // Merge merges pull request to base repository.
  28. // Caller should check PR is ready to be merged (review and status checks)
  29. // FIXME: add repoWorkingPull make sure two merges does not happen at same time.
  30. func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repository, mergeStyle models.MergeStyle, message string) (err error) {
  31. binVersion, err := git.BinVersion()
  32. if err != nil {
  33. log.Error("git.BinVersion: %v", err)
  34. return fmt.Errorf("Unable to get git version: %v", err)
  35. }
  36. if err = pr.GetHeadRepo(); err != nil {
  37. log.Error("GetHeadRepo: %v", err)
  38. return fmt.Errorf("GetHeadRepo: %v", err)
  39. } else if err = pr.GetBaseRepo(); err != nil {
  40. log.Error("GetBaseRepo: %v", err)
  41. return fmt.Errorf("GetBaseRepo: %v", err)
  42. }
  43. prUnit, err := pr.BaseRepo.GetUnit(models.UnitTypePullRequests)
  44. if err != nil {
  45. log.Error("pr.BaseRepo.GetUnit(models.UnitTypePullRequests): %v", err)
  46. return err
  47. }
  48. prConfig := prUnit.PullRequestsConfig()
  49. // Check if merge style is correct and allowed
  50. if !prConfig.IsMergeStyleAllowed(mergeStyle) {
  51. return models.ErrInvalidMergeStyle{ID: pr.BaseRepo.ID, Style: mergeStyle}
  52. }
  53. defer func() {
  54. go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
  55. }()
  56. // Clone base repo.
  57. tmpBasePath, err := createTemporaryRepo(pr)
  58. if err != nil {
  59. log.Error("CreateTemporaryPath: %v", err)
  60. return err
  61. }
  62. defer func() {
  63. if err := models.RemoveTemporaryPath(tmpBasePath); err != nil {
  64. log.Error("Merge: RemoveTemporaryPath: %s", err)
  65. }
  66. }()
  67. baseBranch := "base"
  68. trackingBranch := "tracking"
  69. stagingBranch := "staging"
  70. var outbuf, errbuf strings.Builder
  71. // Enable sparse-checkout
  72. sparseCheckoutList, err := getDiffTree(tmpBasePath, baseBranch, trackingBranch)
  73. if err != nil {
  74. log.Error("getDiffTree(%s, %s, %s): %v", tmpBasePath, baseBranch, trackingBranch, err)
  75. return fmt.Errorf("getDiffTree: %v", err)
  76. }
  77. infoPath := filepath.Join(tmpBasePath, ".git", "info")
  78. if err := os.MkdirAll(infoPath, 0700); err != nil {
  79. log.Error("Unable to create .git/info in %s: %v", tmpBasePath, err)
  80. return fmt.Errorf("Unable to create .git/info in tmpBasePath: %v", err)
  81. }
  82. sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")
  83. if err := ioutil.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
  84. log.Error("Unable to write .git/info/sparse-checkout file in %s: %v", tmpBasePath, err)
  85. return fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %v", err)
  86. }
  87. var gitConfigCommand func() *git.Command
  88. if version.Compare(binVersion, "1.8.0", ">=") {
  89. gitConfigCommand = func() *git.Command {
  90. return git.NewCommand("config", "--local")
  91. }
  92. } else {
  93. gitConfigCommand = func() *git.Command {
  94. return git.NewCommand("config")
  95. }
  96. }
  97. // Switch off LFS process (set required, clean and smudge here also)
  98. if err := gitConfigCommand().AddArguments("filter.lfs.process", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  99. log.Error("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  100. return fmt.Errorf("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  101. }
  102. outbuf.Reset()
  103. errbuf.Reset()
  104. if err := gitConfigCommand().AddArguments("filter.lfs.required", "false").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  105. log.Error("git config [filter.lfs.required -> <false> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  106. return fmt.Errorf("git config [filter.lfs.required -> <false> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  107. }
  108. outbuf.Reset()
  109. errbuf.Reset()
  110. if err := gitConfigCommand().AddArguments("filter.lfs.clean", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  111. log.Error("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  112. return fmt.Errorf("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  113. }
  114. outbuf.Reset()
  115. errbuf.Reset()
  116. if err := gitConfigCommand().AddArguments("filter.lfs.smudge", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  117. log.Error("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  118. return fmt.Errorf("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  119. }
  120. outbuf.Reset()
  121. errbuf.Reset()
  122. if err := gitConfigCommand().AddArguments("core.sparseCheckout", "true").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  123. log.Error("git config [core.sparseCheckout -> true ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  124. return fmt.Errorf("git config [core.sparsecheckout -> true]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  125. }
  126. outbuf.Reset()
  127. errbuf.Reset()
  128. // Read base branch index
  129. if err := git.NewCommand("read-tree", "HEAD").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  130. log.Error("git read-tree HEAD: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  131. return fmt.Errorf("Unable to read base branch in to the index: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
  132. }
  133. outbuf.Reset()
  134. errbuf.Reset()
  135. // Determine if we should sign
  136. signArg := ""
  137. if version.Compare(binVersion, "1.7.9", ">=") {
  138. sign, keyID, _ := pr.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)
  139. if sign {
  140. signArg = "-S" + keyID
  141. } else if version.Compare(binVersion, "2.0.0", ">=") {
  142. signArg = "--no-gpg-sign"
  143. }
  144. }
  145. sig := doer.NewGitSig()
  146. commitTimeStr := time.Now().Format(time.RFC3339)
  147. // Because this may call hooks we should pass in the environment
  148. env := append(os.Environ(),
  149. "GIT_AUTHOR_NAME="+sig.Name,
  150. "GIT_AUTHOR_EMAIL="+sig.Email,
  151. "GIT_AUTHOR_DATE="+commitTimeStr,
  152. "GIT_COMMITTER_NAME="+sig.Name,
  153. "GIT_COMMITTER_EMAIL="+sig.Email,
  154. "GIT_COMMITTER_DATE="+commitTimeStr,
  155. )
  156. // Merge commits.
  157. switch mergeStyle {
  158. case models.MergeStyleMerge:
  159. cmd := git.NewCommand("merge", "--no-ff", "--no-commit", trackingBranch)
  160. if err := runMergeCommand(pr, mergeStyle, cmd, tmpBasePath); err != nil {
  161. log.Error("Unable to merge tracking into base: %v", err)
  162. return err
  163. }
  164. if err := commitAndSignNoAuthor(pr, message, signArg, tmpBasePath, env); err != nil {
  165. log.Error("Unable to make final commit: %v", err)
  166. return err
  167. }
  168. case models.MergeStyleRebase:
  169. fallthrough
  170. case models.MergeStyleRebaseMerge:
  171. // Checkout head branch
  172. if err := git.NewCommand("checkout", "-b", stagingBranch, trackingBranch).RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  173. log.Error("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  174. return fmt.Errorf("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  175. }
  176. outbuf.Reset()
  177. errbuf.Reset()
  178. // Rebase before merging
  179. if err := git.NewCommand("rebase", baseBranch).RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  180. // Rebase will leave a REBASE_HEAD file in .git if there is a conflict
  181. if _, statErr := os.Stat(filepath.Join(tmpBasePath, ".git", "REBASE_HEAD")); statErr == nil {
  182. // The original commit SHA1 that is failing will be in .git/rebase-apply/original-commit
  183. commitShaBytes, readErr := ioutil.ReadFile(filepath.Join(tmpBasePath, ".git", "rebase-apply", "original-commit"))
  184. if readErr != nil {
  185. // Abandon this attempt to handle the error
  186. log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  187. return fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  188. }
  189. log.Debug("RebaseConflict at %s [%s:%s -> %s:%s]: %v\n%s\n%s", strings.TrimSpace(string(commitShaBytes)), pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  190. return models.ErrRebaseConflicts{
  191. Style: mergeStyle,
  192. CommitSHA: strings.TrimSpace(string(commitShaBytes)),
  193. StdOut: outbuf.String(),
  194. StdErr: errbuf.String(),
  195. Err: err,
  196. }
  197. }
  198. log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  199. return fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  200. }
  201. outbuf.Reset()
  202. errbuf.Reset()
  203. // Checkout base branch again
  204. if err := git.NewCommand("checkout", baseBranch).RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  205. log.Error("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  206. return fmt.Errorf("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  207. }
  208. outbuf.Reset()
  209. errbuf.Reset()
  210. cmd := git.NewCommand("merge")
  211. if mergeStyle == models.MergeStyleRebase {
  212. cmd.AddArguments("--ff-only")
  213. } else {
  214. cmd.AddArguments("--no-ff", "--no-commit")
  215. }
  216. cmd.AddArguments(stagingBranch)
  217. // Prepare merge with commit
  218. if err := runMergeCommand(pr, mergeStyle, cmd, tmpBasePath); err != nil {
  219. log.Error("Unable to merge staging into base: %v", err)
  220. return err
  221. }
  222. if mergeStyle == models.MergeStyleRebaseMerge {
  223. if err := commitAndSignNoAuthor(pr, message, signArg, tmpBasePath, env); err != nil {
  224. log.Error("Unable to make final commit: %v", err)
  225. return err
  226. }
  227. }
  228. case models.MergeStyleSquash:
  229. // Merge with squash
  230. cmd := git.NewCommand("merge", "--squash", trackingBranch)
  231. if err := runMergeCommand(pr, mergeStyle, cmd, tmpBasePath); err != nil {
  232. log.Error("Unable to merge --squash tracking into base: %v", err)
  233. return err
  234. }
  235. sig := pr.Issue.Poster.NewGitSig()
  236. if signArg == "" {
  237. if err := git.NewCommand("commit", fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
  238. log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  239. return fmt.Errorf("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  240. }
  241. } else {
  242. if err := git.NewCommand("commit", signArg, fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
  243. log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  244. return fmt.Errorf("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  245. }
  246. }
  247. outbuf.Reset()
  248. errbuf.Reset()
  249. default:
  250. return models.ErrInvalidMergeStyle{ID: pr.BaseRepo.ID, Style: mergeStyle}
  251. }
  252. // OK we should cache our current head and origin/headbranch
  253. mergeHeadSHA, err := git.GetFullCommitID(tmpBasePath, "HEAD")
  254. if err != nil {
  255. return fmt.Errorf("Failed to get full commit id for HEAD: %v", err)
  256. }
  257. mergeBaseSHA, err := git.GetFullCommitID(tmpBasePath, "original_"+baseBranch)
  258. if err != nil {
  259. return fmt.Errorf("Failed to get full commit id for origin/%s: %v", pr.BaseBranch, err)
  260. }
  261. // Now it's questionable about where this should go - either after or before the push
  262. // I think in the interests of data safety - failures to push to the lfs should prevent
  263. // the merge as you can always remerge.
  264. if setting.LFS.StartServer {
  265. if err := LFSPush(tmpBasePath, mergeHeadSHA, mergeBaseSHA, pr); err != nil {
  266. return err
  267. }
  268. }
  269. var headUser *models.User
  270. err = pr.HeadRepo.GetOwner()
  271. if err != nil {
  272. if !models.IsErrUserNotExist(err) {
  273. log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err)
  274. return err
  275. }
  276. log.Error("Can't find user: %d for head repository - defaulting to doer: %s - %v", pr.HeadRepo.OwnerID, doer.Name, err)
  277. headUser = doer
  278. } else {
  279. headUser = pr.HeadRepo.Owner
  280. }
  281. env = models.FullPushingEnvironment(
  282. headUser,
  283. doer,
  284. pr.BaseRepo,
  285. pr.BaseRepo.Name,
  286. pr.ID,
  287. )
  288. // Push back to upstream.
  289. if err := git.NewCommand("push", "origin", baseBranch+":"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
  290. if strings.Contains(errbuf.String(), "non-fast-forward") {
  291. return models.ErrMergePushOutOfDate{
  292. Style: mergeStyle,
  293. StdOut: outbuf.String(),
  294. StdErr: errbuf.String(),
  295. Err: err,
  296. }
  297. }
  298. return fmt.Errorf("git push: %s", errbuf.String())
  299. }
  300. outbuf.Reset()
  301. errbuf.Reset()
  302. pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
  303. if err != nil {
  304. return fmt.Errorf("GetBranchCommit: %v", err)
  305. }
  306. pr.MergedUnix = timeutil.TimeStampNow()
  307. pr.Merger = doer
  308. pr.MergerID = doer.ID
  309. if err = pr.SetMerged(); err != nil {
  310. log.Error("setMerged [%d]: %v", pr.ID, err)
  311. }
  312. notification.NotifyMergePullRequest(pr, doer, baseGitRepo)
  313. // Reset cached commit count
  314. cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))
  315. // Resolve cross references
  316. refs, err := pr.ResolveCrossReferences()
  317. if err != nil {
  318. log.Error("ResolveCrossReferences: %v", err)
  319. return nil
  320. }
  321. for _, ref := range refs {
  322. if err = ref.LoadIssue(); err != nil {
  323. return err
  324. }
  325. if err = ref.Issue.LoadRepo(); err != nil {
  326. return err
  327. }
  328. close := (ref.RefAction == references.XRefActionCloses)
  329. if close != ref.Issue.IsClosed {
  330. if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
  331. return err
  332. }
  333. }
  334. }
  335. return nil
  336. }
  337. func commitAndSignNoAuthor(pr *models.PullRequest, message, signArg, tmpBasePath string, env []string) error {
  338. var outbuf, errbuf strings.Builder
  339. if signArg == "" {
  340. if err := git.NewCommand("commit", "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
  341. log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  342. return fmt.Errorf("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  343. }
  344. } else {
  345. if err := git.NewCommand("commit", signArg, "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
  346. log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  347. return fmt.Errorf("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  348. }
  349. }
  350. return nil
  351. }
  352. func runMergeCommand(pr *models.PullRequest, mergeStyle models.MergeStyle, cmd *git.Command, tmpBasePath string) error {
  353. var outbuf, errbuf strings.Builder
  354. if err := cmd.RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
  355. // Merge will leave a MERGE_HEAD file in the .git folder if there is a conflict
  356. if _, statErr := os.Stat(filepath.Join(tmpBasePath, ".git", "MERGE_HEAD")); statErr == nil {
  357. // We have a merge conflict error
  358. log.Debug("MergeConflict [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  359. return models.ErrMergeConflicts{
  360. Style: mergeStyle,
  361. StdOut: outbuf.String(),
  362. StdErr: errbuf.String(),
  363. Err: err,
  364. }
  365. } else if strings.Contains(errbuf.String(), "refusing to merge unrelated histories") {
  366. log.Debug("MergeUnrelatedHistories [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  367. return models.ErrMergeUnrelatedHistories{
  368. Style: mergeStyle,
  369. StdOut: outbuf.String(),
  370. StdErr: errbuf.String(),
  371. Err: err,
  372. }
  373. }
  374. log.Error("git merge [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  375. return fmt.Errorf("git merge [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
  376. }
  377. return nil
  378. }
  379. var escapedSymbols = regexp.MustCompile(`([*[?! \\])`)
  380. func getDiffTree(repoPath, baseBranch, headBranch string) (string, error) {
  381. getDiffTreeFromBranch := func(repoPath, baseBranch, headBranch string) (string, error) {
  382. var outbuf, errbuf strings.Builder
  383. // Compute the diff-tree for sparse-checkout
  384. if err := git.NewCommand("diff-tree", "--no-commit-id", "--name-only", "-r", "-z", "--root", baseBranch, headBranch, "--").RunInDirPipeline(repoPath, &outbuf, &errbuf); err != nil {
  385. return "", fmt.Errorf("git diff-tree [%s base:%s head:%s]: %s", repoPath, baseBranch, headBranch, errbuf.String())
  386. }
  387. return outbuf.String(), nil
  388. }
  389. scanNullTerminatedStrings := func(data []byte, atEOF bool) (advance int, token []byte, err error) {
  390. if atEOF && len(data) == 0 {
  391. return 0, nil, nil
  392. }
  393. if i := bytes.IndexByte(data, '\x00'); i >= 0 {
  394. return i + 1, data[0:i], nil
  395. }
  396. if atEOF {
  397. return len(data), data, nil
  398. }
  399. return 0, nil, nil
  400. }
  401. list, err := getDiffTreeFromBranch(repoPath, baseBranch, headBranch)
  402. if err != nil {
  403. return "", err
  404. }
  405. // Prefixing '/' for each entry, otherwise all files with the same name in subdirectories would be matched.
  406. out := bytes.Buffer{}
  407. scanner := bufio.NewScanner(strings.NewReader(list))
  408. scanner.Split(scanNullTerminatedStrings)
  409. for scanner.Scan() {
  410. filepath := scanner.Text()
  411. // escape '*', '?', '[', spaces and '!' prefix
  412. filepath = escapedSymbols.ReplaceAllString(filepath, `\$1`)
  413. // no necessary to escape the first '#' symbol because the first symbol is '/'
  414. fmt.Fprintf(&out, "/%s\n", filepath)
  415. }
  416. return out.String(), nil
  417. }
  418. // IsSignedIfRequired check if merge will be signed if required
  419. func IsSignedIfRequired(pr *models.PullRequest, doer *models.User) (bool, error) {
  420. if err := pr.LoadProtectedBranch(); err != nil {
  421. return false, err
  422. }
  423. if pr.ProtectedBranch == nil || !pr.ProtectedBranch.RequireSignedCommits {
  424. return true, nil
  425. }
  426. sign, _, err := pr.SignMerge(doer, pr.BaseRepo.RepoPath(), pr.BaseBranch, pr.GetGitRefName())
  427. return sign, err
  428. }
  429. // IsUserAllowedToMerge check if user is allowed to merge PR with given permissions and branch protections
  430. func IsUserAllowedToMerge(pr *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
  431. if p.IsAdmin() {
  432. return true, nil
  433. }
  434. if !p.CanWrite(models.UnitTypeCode) {
  435. return false, nil
  436. }
  437. err := pr.LoadProtectedBranch()
  438. if err != nil {
  439. return false, err
  440. }
  441. if pr.ProtectedBranch == nil || pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID) {
  442. return true, nil
  443. }
  444. return false, nil
  445. }
  446. // CheckPRReadyToMerge checks whether the PR is ready to be merged (reviews and status checks)
  447. func CheckPRReadyToMerge(pr *models.PullRequest) (err error) {
  448. if pr.BaseRepo == nil {
  449. if err = pr.GetBaseRepo(); err != nil {
  450. return fmt.Errorf("GetBaseRepo: %v", err)
  451. }
  452. }
  453. if pr.ProtectedBranch == nil {
  454. if err = pr.LoadProtectedBranch(); err != nil {
  455. return fmt.Errorf("LoadProtectedBranch: %v", err)
  456. }
  457. if pr.ProtectedBranch == nil {
  458. return nil
  459. }
  460. }
  461. isPass, err := IsPullCommitStatusPass(pr)
  462. if err != nil {
  463. return err
  464. }
  465. if !isPass {
  466. return models.ErrNotAllowedToMerge{
  467. Reason: "Not all required status checks successful",
  468. }
  469. }
  470. if enoughApprovals := pr.ProtectedBranch.HasEnoughApprovals(pr); !enoughApprovals {
  471. return models.ErrNotAllowedToMerge{
  472. Reason: "Does not have enough approvals",
  473. }
  474. }
  475. if rejected := pr.ProtectedBranch.MergeBlockedByRejectedReview(pr); rejected {
  476. return models.ErrNotAllowedToMerge{
  477. Reason: "There are requested changes",
  478. }
  479. }
  480. return nil
  481. }