{"push_id":655799229,"size":8,"distinct_size":4,"ref":"refs/heads/master","head":"7998126a944e538ed4f37b8f2ace4a733fe29368","before":"6a77fe4864cae2c8dbad0be9f94f0e386fa71b02","commits":[{"sha":"fe4f5ac1a5e481277c984e342d663f7aa30a722d","author":{"email":"4068f0880b399410602d694b3cc711c8a8f4727e@smacleod.ca","name":"Steven MacLeod"},"message":"Fix git parser assuming header presence and order.\n\nThe git diff format does not specify the order of extended headers or\nthat certain headers must appear with others. We were assuming some\nordering and header dependencies that while true in the git case are\nnot true for git diffs generated by mercurial.\n\nWe now parse all of the headers at once ignoring order and then act on\nthem after the header parsing is complete. The GitDiffParser should\nnow properly parse a mercurial generated git diff.\n\nTesting Done:\nUnit tests pass, hg git diff parses.\n\nReviewed at https://reviews.reviewboard.org/r/7263/","distinct":false,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/fe4f5ac1a5e481277c984e342d663f7aa30a722d"},{"sha":"f71fb328f0c50ea4ca875f7f217760446c8681f7","author":{"email":"4068f0880b399410602d694b3cc711c8a8f4727e@smacleod.ca","name":"Steven MacLeod"},"message":"Add mercurial generated git diff parser.\n\nThis adds a new HgGitDiffParser which will parse the headers generated\nby \"hg export --git\" and then rely on the GitDiffParser to parse the\ndiff contents.\n\nThe logic for deciding which hg parser to use has also been changed\nslightly so that it takes into account the possible presence of the\ncommented headers hg provides.\n\nTests for mercurial git diff parsing have been updated to provide the\nproper extended headers.\n\nTesting Done:\nNew tests, unit tests pass, uploaded diff from \"hg export --git\" parses and displays.\n\nReviewed at https://reviews.reviewboard.org/r/7264/","distinct":false,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/f71fb328f0c50ea4ca875f7f217760446c8681f7"},{"sha":"6b34af11397d92ae5c396ed911840ae6b0392cfd","author":{"email":"4068f0880b399410602d694b3cc711c8a8f4727e@smacleod.ca","name":"Steven MacLeod"},"message":"Make `SCMTool.get_file()` take `base_commit_id`.\n\nAll SCMTool implementations should now take keyword arguments and a\nbase_commit_id argument. All internal implementations have been\nconverted and third party tools will cause a deprecation warning if\nthey do not have the proper method signature.\n\nThe HgTool now takes advantage of this `base_commit_id` argument when\nfetching files (since hg git diffs do not include index lines which\nwe use to determine what revisions to fetch). If `base_commit_id` is\nprovided it will override anything parsed from the diff.\n\nThe same applies to SCMTool.file_exists()\n\nTesting Done:\nNew tests, unit tests pass, posted hg diff now uses the provided base_commit_id.\n\nReviewed at https://reviews.reviewboard.org/r/7265/","distinct":false,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/6b34af11397d92ae5c396ed911840ae6b0392cfd"},{"sha":"afe8562c75e9df18a023be31d9dfd5904517da91","author":{"email":"d48e92e0fe6588b5a3f3112bd87e4d5c011e10af@beanbaginc.com","name":"Barret Rennie"},"message":"Reorder imports\n\nThis fixes the incorrect import order in commit\n6b34af11397d92ae5c396ed911840ae6b0392cfd. This is a trivial change.","distinct":false,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/afe8562c75e9df18a023be31d9dfd5904517da91"},{"sha":"07ad06c45ac46773e9f2b37faadc5cbefa6fe4b8","author":{"email":"d48e92e0fe6588b5a3f3112bd87e4d5c011e10af@beanbaginc.com","name":"Barret Rennie"},"message":"Merge branch 'release-2.0.x' into release-2.5.x","distinct":true,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/07ad06c45ac46773e9f2b37faadc5cbefa6fe4b8"},{"sha":"8611457c1df96aa79c4040f4784bea278c264eba","author":{"email":"d48e92e0fe6588b5a3f3112bd87e4d5c011e10af@beanbaginc.com","name":"Barret Rennie"},"message":"Merge branch 'release-2.5.x'","distinct":true,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/8611457c1df96aa79c4040f4784bea278c264eba"},{"sha":"d350cdad44a009524b87815217f11f7c38473b60","author":{"email":"2314b2e3a4a1f7db165be2aafbf1efd78f28cc97@beanbaginc.com","name":"Christian Hammond"},"message":"Fix a default value change causing datagrid unit tests to fail.\n\nThe recent introduction of an \"All\" page on AlphanumericDataGrid, which\nis now the default, broke the unit tests for the /users/ page. The test\nassumed the original default of showing usernames starting with \"A\" was\nstill in effect. We're now using the appropriate defualt for listing all\nusers.","distinct":true,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/d350cdad44a009524b87815217f11f7c38473b60"},{"sha":"7998126a944e538ed4f37b8f2ace4a733fe29368","author":{"email":"2314b2e3a4a1f7db165be2aafbf1efd78f28cc97@beanbaginc.com","name":"Christian Hammond"},"message":"Merge branch 'release-2.5.x'","distinct":true,"url":"https://api.github.com/repos/chipx86/reviewboard/commits/7998126a944e538ed4f37b8f2ace4a733fe29368"}]}