* New Year, New PR Thread @ 2021-03-05 17:10 Bret Barkelew 2021-03-08 1:20 ` 回复: [edk2-devel] " gaoliming 0 siblings, 1 reply; 7+ messages in thread From: Bret Barkelew @ 2021-03-05 17:10 UTC (permalink / raw) To: devel@edk2.groups.io [-- Attachment #1: Type: text/plain, Size: 68 bytes --] Can we move to PRs yet? Maybe after the stabilization? - Bret [-- Attachment #2: Type: text/html, Size: 1328 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* 回复: [edk2-devel] New Year, New PR Thread 2021-03-05 17:10 New Year, New PR Thread Bret Barkelew @ 2021-03-08 1:20 ` gaoliming 2021-03-08 2:20 ` Rebecca Cran 0 siblings, 1 reply; 7+ messages in thread From: gaoliming @ 2021-03-08 1:20 UTC (permalink / raw) To: devel, bret.barkelew [-- Attachment #1: Type: text/plain, Size: 441 bytes --] Bret: What means New Year or New PR Thread? Now, 202102 stable tag has been done. The code can be merged by PR again. Thanks Liming 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Bret Barkelew via groups.io 发送时间: 2021年3月6日 1:11 收件人: devel@edk2.groups.io 主题: [edk2-devel] New Year, New PR Thread Can we move to PRs yet? Maybe after the stabilization? - Bret [-- Attachment #2: Type: text/html, Size: 3994 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: 回复: [edk2-devel] New Year, New PR Thread 2021-03-08 1:20 ` 回复: [edk2-devel] " gaoliming @ 2021-03-08 2:20 ` Rebecca Cran 2021-03-08 2:31 ` Ni, Ray 0 siblings, 1 reply; 7+ messages in thread From: Rebecca Cran @ 2021-03-08 2:20 UTC (permalink / raw) To: devel, gaoliming, bret.barkelew There's a plan to move away from submitting patches as emails, and to use pull requests for code review instead. -- Rebecca Cran On 3/7/21 6:20 PM, gaoliming wrote: > Bret: > > What means New Year or New PR Thread? > > Now, 202102 stable tag has been done. The code can be merged by PR > again. > > Thanks > > Liming > > *发件人:*devel@edk2.groups.io <devel@edk2.groups.io> *代表 *Bret > Barkelew via groups.io > *发送时间:*2021年3月6日1:11 > *收件人:*devel@edk2.groups.io > *主题:*[edk2-devel] New Year, New PR Thread > > Can we move to PRs yet? Maybe after the stabilization? > > - Bret > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: 回复: [edk2-devel] New Year, New PR Thread 2021-03-08 2:20 ` Rebecca Cran @ 2021-03-08 2:31 ` Ni, Ray 2021-03-08 2:43 ` Rebecca Cran 0 siblings, 1 reply; 7+ messages in thread From: Ni, Ray @ 2021-03-08 2:31 UTC (permalink / raw) To: devel@edk2.groups.io, rebecca@nuviainc.com, gaoliming@byosoft.com.cn, bret.barkelew@microsoft.com It will be great if PR can replace mail code review. When can we do the move? > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca > Cran > Sent: Monday, March 8, 2021 10:21 AM > To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; > bret.barkelew@microsoft.com > Subject: Re: 回复: [edk2-devel] New Year, New PR Thread > > There's a plan to move away from submitting patches as emails, and to > use pull requests for code review instead. > > -- > Rebecca Cran > > On 3/7/21 6:20 PM, gaoliming wrote: > > Bret: > > > > What means New Year or New PR Thread? > > > > Now, 202102 stable tag has been done. The code can be merged by PR > > again. > > > > Thanks > > > > Liming > > > > *发件人:*devel@edk2.groups.io <devel@edk2.groups.io> *代表 *Bret > > Barkelew via groups.io > > *发送时间:*2021年3月6日1:11 > > *收件人:*devel@edk2.groups.io > > *主题:*[edk2-devel] New Year, New PR Thread > > > > Can we move to PRs yet? Maybe after the stabilization? > > > > - Bret > > > > > > > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: 回复: [edk2-devel] New Year, New PR Thread 2021-03-08 2:31 ` Ni, Ray @ 2021-03-08 2:43 ` Rebecca Cran 2021-03-08 12:26 ` Ni, Ray 0 siblings, 1 reply; 7+ messages in thread From: Rebecca Cran @ 2021-03-08 2:43 UTC (permalink / raw) To: Ni, Ray, devel@edk2.groups.io, gaoliming@byosoft.com.cn, bret.barkelew@microsoft.com It was discussed in the recent Community Meeting last week. Now that the stable tag has been created, I believe it's moving forward as the highest priority task (behind, for example, converting the line endings from Windows to UNIX). -- Rebecca Cran On 3/7/21 7:31 PM, Ni, Ray wrote: > It will be great if PR can replace mail code review. > When can we do the move? > >> -----Original Message----- >> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca >> Cran >> Sent: Monday, March 8, 2021 10:21 AM >> To: devel@edk2.groups.io; gaoliming@byosoft.com.cn; >> bret.barkelew@microsoft.com >> Subject: Re: 回复: [edk2-devel] New Year, New PR Thread >> >> There's a plan to move away from submitting patches as emails, and to >> use pull requests for code review instead. >> >> -- >> Rebecca Cran >> >> On 3/7/21 6:20 PM, gaoliming wrote: >>> Bret: >>> >>> What means New Year or New PR Thread? >>> >>> Now, 202102 stable tag has been done. The code can be merged by PR >>> again. >>> >>> Thanks >>> >>> Liming >>> >>> *发件人:*devel@edk2.groups.io <devel@edk2.groups.io> *代表 *Bret >>> Barkelew via groups.io >>> *发送时间:*2021年3月6日1:11 >>> *收件人:*devel@edk2.groups.io >>> *主题:*[edk2-devel] New Year, New PR Thread >>> >>> Can we move to PRs yet? Maybe after the stabilization? >>> >>> - Bret >>> >>> >> >> >> >> >> > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: 回复: [edk2-devel] New Year, New PR Thread 2021-03-08 2:43 ` Rebecca Cran @ 2021-03-08 12:26 ` Ni, Ray 2021-03-08 15:33 ` Laszlo Ersek 0 siblings, 1 reply; 7+ messages in thread From: Ni, Ray @ 2021-03-08 12:26 UTC (permalink / raw) To: Rebecca Cran, devel@edk2.groups.io, gaoliming@byosoft.com.cn, bret.barkelew@microsoft.com > -----Original Message----- > From: Rebecca Cran <rebecca@nuviainc.com> > Sent: Monday, March 8, 2021 10:43 AM > To: Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io; gaoliming@byosoft.com.cn; bret.barkelew@microsoft.com > Subject: Re: 回复: [edk2-devel] New Year, New PR Thread > > It was discussed in the recent Community Meeting last week. > > Now that the stable tag has been created, I believe it's moving forward > as the highest priority task (behind, for example, converting the line > endings from Windows to UNIX). Converting the line endings will cause "git blame" useless because every line of code now is changed by someone who changes the line endings. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: 回复: [edk2-devel] New Year, New PR Thread 2021-03-08 12:26 ` Ni, Ray @ 2021-03-08 15:33 ` Laszlo Ersek 0 siblings, 0 replies; 7+ messages in thread From: Laszlo Ersek @ 2021-03-08 15:33 UTC (permalink / raw) To: devel, ray.ni, Rebecca Cran, gaoliming@byosoft.com.cn, bret.barkelew@microsoft.com Hi Ray, On 03/08/21 13:26, Ni, Ray wrote: > > >> -----Original Message----- >> From: Rebecca Cran <rebecca@nuviainc.com> >> Sent: Monday, March 8, 2021 10:43 AM >> To: Ni, Ray <ray.ni@intel.com>; devel@edk2.groups.io; gaoliming@byosoft.com.cn; bret.barkelew@microsoft.com >> Subject: Re: 回复: [edk2-devel] New Year, New PR Thread >> >> It was discussed in the recent Community Meeting last week. >> >> Now that the stable tag has been created, I believe it's moving forward >> as the highest priority task (behind, for example, converting the line >> endings from Windows to UNIX). > > Converting the line endings will cause "git blame" useless because > every line of code now is changed by someone who changes the line endings. it doesn't make git-blame useless, just a bit less comfortable. For example, with master being at 59a3ccb09e7a, assume you run: git blame -- BaseTools/Scripts/ConvertFceToStructurePcd.py and you get an output snippet like ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 528) for i in range(len(info_list)-1,-1,-1): ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 529) if len(info_list[i]) == 0: ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 530) info_list.remove(info_list[i]) d79b63c64f58a (Leif Lindholm 2019-09-18 22:41:08 +0100 531) for i in (inf_list, title_all, header_list): d79b63c64f58a (Leif Lindholm 2019-09-18 22:41:08 +0100 532) i.sort() ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 533) return keys,title_all,info_list,header_list,inf_list Assume you are curious about the "sort" invocation, so you run git show d79b63c64f58a But that only tells you: commit d79b63c64f58ac47e570e8d2e9b090525f7e8efd Author: Leif Lindholm <leif.lindholm@linaro.org> Date: Wed Sep 18 22:41:08 2019 +0100 BaseTools: correct line endings for ConvertFce Python script Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> Reviewed-by: Bob Feng <bob.c.feng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com> So what can we do in this case? Simple: run git blame "as of the direct parent" of commit d79b63c64f58a: git blame d79b63c64f58a^ -- BaseTools/Scripts/ConvertFceToStructurePcd.py Then you get: ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 506) for i in range(len(info_list)-1,-1,-1): ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 507) if len(info_list[i]) == 0: ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 508) info_list.remove(info_list[i]) cfb29d2bda57b (Fan, ZhijuX 2019-04-15 16:55:01 +0800 509) for i in (inf_list, title_all, header_list): cfb29d2bda57b (Fan, ZhijuX 2019-04-15 16:55:01 +0800 510) i.sort() ef529e6ab7c31 (Liming Gao 2018-07-17 11:42:21 +0800 511) return keys,title_all,info_list,header_list,inf_list And this time you can run: git show cfb29d2bda57b which gives you the commit you are after: commit cfb29d2bda57baa344bded40cf12af81b13e8a40 Author: Fan, ZhijuX <zhijux.fan@intel.com> Date: Mon Apr 15 16:55:01 2019 +0800 BaseTools:update ConvertFceToStructurePcd.py with the char order PCD name. BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1718 BaseTools\Scripts\ConvertFceToStructurePcd.py Update script to sort the PCD order base on PcdName, then base on Pcd field name. Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com> This command sequence can be repeated as many times as necessary. git-blame gives you a commit, run git-show to check the commit. If the commit is not relevant (i.e., you need to run earlier), re-run git-blame on the same file, but at the *direct parent commit* of the previously used commit, using the caret (^) notation. It also works if files are renamed (or code is moved between files). In that case, "git-show" will tell you the original file name, so when you run git-blame on the parent commit, you can use the original file name too. Thanks Laszlo ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-03-08 15:33 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-03-05 17:10 New Year, New PR Thread Bret Barkelew 2021-03-08 1:20 ` 回复: [edk2-devel] " gaoliming 2021-03-08 2:20 ` Rebecca Cran 2021-03-08 2:31 ` Ni, Ray 2021-03-08 2:43 ` Rebecca Cran 2021-03-08 12:26 ` Ni, Ray 2021-03-08 15:33 ` Laszlo Ersek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox