[Gluster-devel] git-branch-diff: wrapper script for git to visualize backports

[Prasanna Kalever]

Hi all,

checkout http://review.gluster.org/14230
I have added more cool features in patch set 2 to meet both developers
as well as release maintainers expectations.

Thanks,
--
Prasanna


On Fri, May 6, 2016 at 1:22 PM, Prasanna Kalever <pkalever at redhat.com> wrote:
> On Fri, May 6, 2016 at 12:03 PM, Atin Mukherjee <amukherj at redhat.com> wrote:
>>
>>
>> On 05/05/2016 11:25 PM, Prasanna Kalever wrote:
>>> Hi Team,
>>>
>>> Checkout glusterfs script that is capable of showing your list of commits
>>> missed (backporting) in other branches (say 3.7.12) w.r.t master
>>>
>>> http://review.gluster.org/#/c/14230/
>>>
>>>
>>> This script helps in visualizing backported and missed commits between two
>>> different branches.
>>>
>>> While backporting commit to another branch only subject of the patch may
>>> remain unchanged, all others such as commit message,  commit Id, change Id,
>>> bug Id, will be changed. This script works by taking commit subject as the
>>> key value for comparing two git branches, which can be local or remote.
>> Nice work!! This will be really helpful in situation like now where we
>> have to backport almost all our fixes from mainline to 3.7 & 3.8 branches.
>>
>> I'd also request you to send a report on the patches missing in 3.8
>> branch and send a reminder to all the developers asking for the backports.
>>
>> Also is there a way to limit the comparison? For an example I may be
>> interested in seeing the delta between mainline and last 3.7 release
>> i.e. 3.7.11 and do not want to compare the whole 3.7 branch?
>
> Thank you Atin, that a good Idea.
> That can be done using git tags, but I need to some more investigation
> with the git :)
>
> I would like to here more from the developers to make this tool better.
>
> --
> Prasanna
>>
>> ~Atin
>>>
>>>
>>>
>>> Help:
>>>
>>> $ ./extras/git-branch-diff.py --help
>>>     usage: git-branch-diff.py [-h] [-s SOURCE_BRANCH] -t TARGET_BRANCH
>>>                               [-a GIT_AUTHOR] [-p REPO_PATH]
>>>
>>>     git wrapper to diff local/remote branches
>>>
>>>     optional arguments:
>>>       -h, --help            show this help message and exit
>>>       -s SOURCE_BRANCH, --source-branch SOURCE_BRANCH
>>>                             source branch name
>>>       -t TARGET_BRANCH, --target-branch TARGET_BRANCH
>>>                             target branch name
>>>       -a GIT_AUTHOR, --author GIT_AUTHOR
>>>                             default: git config name/email
>>>       -p REPO_PATH, --path REPO_PATH
>>>                             show branches diff specific to path
>>>
>>>
>>> Sample usages:
>>>
>>>   $ ./extras/git-branch-diff.py -t origin/release-3.8
>>>   $ ./extras/git-branch-diff.py -s local_branch -t origin/release-3.7
>>>   $ ./extras/git-branch-diff.py -t origin/release-3.8
>>> --author="user2 at redhat.com"
>>>   $ ./extras/git-branch-diff.py -t origin/release-3.8 --path="xlators/"
>>>
>>>   $ ./extras/git-branch-diff.py -t origin/release-3.8 --author=""
>>>
>>>
>>>
>>> Example output:
>>>
>>> $ ./extras/git-branch-diff.py -t origin/release-3.8 --path=./rpc
>>>
>>> ------------------------------------------------------------
>>>
>>> [ ✔ ] Successfully Backported changes:
>>>         {from: remotes/origin/master  to: origin/release-3.8}
>>>
>>> glusterd: try to connect on GF_PMAP_PORT_FOREIGN aswell
>>> rpc: fix gf_process_reserved_ports
>>> rpc: assign port only if it is unreserved
>>> server/protocol: option for dynamic authorization of client permissions
>>> rpc: fix binding brick issue while bind-insecure is enabled
>>> rpc: By default set allow-insecure, bind-insecure to on
>>>
>>> ------------------------------------------------------------
>>>
>>> [ ✖ ] Missing patches in origin/release-3.8:
>>>
>>> glusterd: add defence mechanism to avoid brick port clashes
>>> rpc: define client port range
>>>
>>> ------------------------------------------------------------
>>>
>>>
>>> Note: This script may ignore commits which have altered their commit subjects
>>> while backporting patches. Also this script doesn't have any intelligence to
>>> detect squashed commits.
>>>
>>>
>>>
>>> Thanks,
>>> --
>>> Prasanna
>>> _______________________________________________
>>> Gluster-devel mailing list
>>> Gluster-devel at gluster.org
>>> http://www.gluster.org/mailman/listinfo/gluster-devel
>>>