)]}' { "log": [ { "commit": "0936aeab2ca7553a40d6cc7aa9a13bb083949e10", "tree": "8463bfb8a61d8539fa374fd0fafcface41e817fb", "parents": [ "5cf16607d33268ab0320a886c4a7b5e052684fa4" ], "author": { "name": "Scott Anderson", "email": "camel@droidmod.org", "time": "Fri Oct 17 15:37:12 2014 -0400" }, "committer": { "name": "Scott Anderson", "email": "camel@droidmod.org", "time": "Fri Oct 17 15:45:57 2014 -0400" }, "message": "Exit 1 if repo download -c fails\n\nChange-Id: I6985548bf87032b121eeccf858c4eeca1a60598c\n" }, { "commit": "1829101e285cf7956d045cf7a04a8adb7f4c0109", "tree": "ab68a895f67489ee207b4cb340f7010d75c34bb0", "parents": [ "1966133f8e82971f2e247a8579735a3b2f19301d" ], "author": { "name": "Rob Ward", "email": "robert.ward114@googlemail.com", "time": "Sun Feb 02 11:42:05 2014 +0000" }, "committer": { "name": "Rob Ward", "email": "robert.ward114@googlemail.com", "time": "Tue Feb 11 18:19:04 2014 +0000" }, "message": "Add error message for download -c conflicts\n\nCurrently if you run repo download -c on a change and the cherry-pick\nruns into a merge conflict a Traceback is produced:\n\nrob@rob-i5-lm ~/Programming/repo_test/repo1 $ repo download -c repo1 3/1\nFrom ssh://rob-i5-lm:29418/repo1\n * branch refs/changes/03/3/1 -\u003e FETCH_HEAD\nerror: could not apply 0c8b474... 2\nhint: after resolving the conflicts, mark the corrected paths\nhint: with \u0027git add \u003cpaths\u003e\u0027 or \u0027git rm \u003cpaths\u003e\u0027\nhint: and commit the result with \u0027git commit\u0027\nTraceback (most recent call last):\n File \"/home/rob/Programming/git-repo/main.py\", line 408, in \u003cmodule\u003e\n _Main(sys.argv[1:])\n File \"/home/rob/Programming/git-repo/main.py\", line 384, in _Main\n result \u003d repo._Run(argv) or 0\n File \"/home/rob/Programming/git-repo/main.py\", line 143, in _Run\n result \u003d cmd.Execute(copts, cargs)\n File \"/home/rob/Programming/git-repo/subcmds/download.py\", line 90, in Execute\n project._CherryPick(dl.commit)\n File \"/home/rob/Programming/git-repo/project.py\", line 1943, in _CherryPick\n raise GitError(\u0027%s cherry-pick %s \u0027 % (self.name, rev))\nerror.GitError: repo1 cherry-pick 0c8b4740f876f8f8372bbaed430f02b6ba8b1898\n\nThis amount of error message is confusing to users and has the side effect\nof the git message telling you the actual issue being ignored.\n\nThis change introduces a message stating that the cherry-pick couldn\u0027t\nbe completed removing the Traceback.\n\nTo reproduce the issue create a change that causes a conflict with one currently\nin review and use repo download -c to cherry-pick the conflicting change.\n\nChange-Id: I8ddf4e0c8ad9bd04b1af5360313f67cc053f7d6a\n" }, { "commit": "8f62fb7bd305337994bced7d23b347d0d39f5faf", "tree": "7a00915a4e6138fe2c12d6f8d181b623df8962a2", "parents": [ "c1b86a232383748811c6faf17f364e63e10f7dd4" ], "author": { "name": "David Pursehouse", "email": "david.pursehouse@sonymobile.com", "time": "Wed Nov 14 12:09:38 2012 +0900" }, "committer": { "name": "David Pursehouse", "email": "david.pursehouse@sonymobile.com", "time": "Wed Nov 14 12:09:38 2012 +0900" }, "message": "Tidy up code formatting a bit more\n\nEnable the following Pylint warnings:\n\n C0322: Operator not preceded by a space\n C0323: Operator not followed by a space\n C0324: Comma not followed by a space\n\nAnd make the necessary fixes.\n\nChange-Id: I74d74283ad5138cbaf28d492b18614eb355ff9fe\n" }, { "commit": "cecd1d864fc3cf02cf50d367111e0d0e173c5dc6", "tree": "b4f660400560dce21cd7a00ffe5a5d74b54bcb81", "parents": [ "fc241240d828d7e8302dc0876608a9d27ae1cbc7" ], "author": { "name": "Sarah Owens", "email": "sarato@inkylabs.com", "time": "Thu Nov 01 22:59:27 2012 -0700" }, "committer": { "name": "Sarah Owens", "email": "sarato@inkylabs.com", "time": "Tue Nov 13 17:33:56 2012 -0800" }, "message": "Change print statements to work in python3\n\nThis is part of a series of changes to introduce Python3 support.\n\nChange-Id: I373be5de7141aa127d7debdbce1df39148dbec32\n" }, { "commit": "e15c65abc25cd1d5d77ec6815a3c011b9f57ddac", "tree": "43bd95e2e83abcd88c5d05b6a65393877c51028b", "parents": [ "daa851f6cd9edb3851a3884fd2864f0f3dc583b2" ], "author": { "name": "David Pursehouse", "email": "david.pursehouse@sonymobile.com", "time": "Wed Aug 22 10:46:11 2012 +0900" }, "committer": { "name": "Gustaf Lundh", "email": "gustaf.lundh@sonymobile.com", "time": "Thu Aug 23 12:15:26 2012 +0200" }, "message": "Remove unused imports\n\nThere are several imports that are not used. Remove them.\n\nChange-Id: I2ac3be66827bd68d3faedcef7d6bbf30ea01d3f2\n" }, { "commit": "3d125940f6223efe62e35b795f57e7e717b4528e", "tree": "518bdd11c5cd3e5f57afdf16a3e1fe3ec1df8370", "parents": [ "a94f162b9fe85389f3e1c9555628d9229105e15d" ], "author": { "name": "Pierre Tardy", "email": "pierre.tardy@intel.com", "time": "Fri May 04 12:18:12 2012 +0200" }, "committer": { "name": "Shawn O. Pearce", "email": "sop@google.com", "time": "Thu May 24 09:04:20 2012 -0700" }, "message": "repo download: add --ff-only option\n\nAllows to ff-only a gerrit patch\nThis patch is necessary to automatically ensure that the patch will\nbe correctly submitted on ff-only gerrit projects\n\nYou can now use:\nrepo download (--ff-only|-f) project changeid/patchnumber\n\nThis is useful to automate verification of fast forward status of a patch\nin the context of build automation, and commit gating (e.g. buildbot)\n\nChange-Id: I403a667557a105411a633e62c8eec23d93724b43\nSigned-off-by: Erwan Mahe \u003cerwan.mahe@intel.com\u003e\nSigned-off-by: Pierre Tardy \u003cpierre.tardy@intel.com\u003e\n" }, { "commit": "a94f162b9fe85389f3e1c9555628d9229105e15d", "tree": "da3852d6ede787a8d1974cddab3db8c98e4fc39e", "parents": [ "e5a2122e6429b5eee861807e7050eb02045a7d4f" ], "author": { "name": "Erwan Mahe", "email": "erwan.mahe@intel.com", "time": "Fri Aug 19 13:56:09 2011 +0200" }, "committer": { "name": "Shawn O. Pearce", "email": "sop@google.com", "time": "Thu May 24 09:03:10 2012 -0700" }, "message": "repo download: add --revert option\n\nBZ: 4779\nAllows to revert a gerrit patch\nThis patch is necessary for the on-demand creation of\nengineering builds using buildbot\n\nYou can now use:\nrepo download [--revert|-r project changeid/patchnumber\n\nThis is useful to automate reverting of a patch\nin the context of build automation, and regression bisection\n\nChange-Id: I3985e80e4b2a230f83526191ea1379765a54bdcf\nSigned-off-by: Erwan Mahe \u003cerwan.mahe@intel.com\u003e\nSigned-off-by: Pierre Tardy \u003cpierre.tardy@intel.com\u003e\n" }, { "commit": "e5a2122e6429b5eee861807e7050eb02045a7d4f", "tree": "b58878391a4a6a80bdda7edf096d22cff8b7f1c4", "parents": [ "ccf86432b39ce2506fca472bbdbe379fdc53d3e3" ], "author": { "name": "Pierre Tardy", "email": "pierre.tardy@intel.com", "time": "Thu Mar 24 16:28:18 2011 +0100" }, "committer": { "name": "Shawn O. Pearce", "email": "sop@google.com", "time": "Thu May 24 09:02:38 2012 -0700" }, "message": "repo download: add --cherry-pick option\n\ndefault option uses git checkout, and thus overwrite the previous\ncheckouts. this is a problem for automated builds of several\nchangesets in the same project for daily builds of pending submission\n\nYou can now use:\nrepo download [--cherry-pick|-c] project changeid/patchnumber\n\nThis will parse the manifest, cd to the corresponding project\ndownload the changes to FETCH_HEAD and cherry-pick the result.\n\nThis is useful to automate cherry-picking of a patch\nin the context of build automation, and commit gating (e.g. buildbot)\n\nChange-Id: Ib638afd87677f1be197afb7b0f73c70fb98909fe\nSigned-off-by: Pierre Tardy \u003cpierre.tardy@intel.com\u003e\n" }, { "commit": "de8b2c4276afec670dee5c7942ac74f2d0c66500", "tree": "4340130ff76580c6ff1a6f41a386bceb21ce91cc", "parents": [ "727ee98a401b5993f6b952074f43c7f770604acf" ], "author": { "name": "Thiago Farina", "email": "thiago.farina@gmail.com", "time": "Wed Sep 09 00:41:34 2009 -0400" }, "committer": { "name": "Shawn O. Pearce", "email": "sop@google.com", "time": "Sun Jan 09 17:39:22 2011 -0800" }, "message": "Fix to display the usage message of the command download when the user\ndon\u0027t provide any arguments to \u0027repo download\u0027.\n\nSigned-off-by: Thiago Farina \u003cthiago.farina@gmail.com\u003e\n(cherry picked from commit 840ed0fab7cb4c2ab296c7d7d45f13e2523bae1c)\n" }, { "commit": "632768bc65ae0f1dc9eb9260c9146c42d9965a18", "tree": "f8fc564a40e5886c74062d6be751ca4c2769721c", "parents": [ "0758d2f1d61288c83282749d2b36958d2c289e7f" ], "author": { "name": "Shawn O. Pearce", "email": "sop@google.com", "time": "Thu Oct 23 11:58:52 2008 -0700" }, "committer": { "name": "Shawn O. Pearce", "email": "sop@google.com", "time": "Thu Oct 23 14:43:28 2008 -0700" }, "message": "Teach repo how to download changes to the local checkout\n\nNow `repo download . 1402` would download the change numbered 1402\ninto the current project and check it out for the user, using a\ndetached HEAD. `repo sync .` would back out of the change and\nreturn to the upstream version.\n\nMultiple projects can be fetched at once by listing them out on\nthe command line as different arguments.\n\nIndividual patch sets can be selected by adding a \u0027/n\u0027 to indicate\nthe n-th patch set should be downloaded instead of the default of\npatch set 1.\n\nSigned-off-by: Shawn O. Pearce \u003csop@google.com\u003e\n" } ] }