|
1 | 1 | !/bin/python2 |
2 | 2 |
|
3 | | -""" |
4 | | - Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> |
5 | | - This file is part of GlusterFS. |
6 | | -
|
7 | | - This file is licensed to you under your choice of the GNU Lesser |
8 | | - General Public License, version 3 or any later version (LGPLv3 or |
9 | | - later), or the GNU General Public License, version 2 (GPLv2), in all |
10 | | - cases as published by the Free Software Foundation. |
11 | | -""" |
12 | | - |
13 | | -""" |
14 | | - ABOUT: |
15 | | - This script helps in visualizing backported and missed commits between two |
16 | | - different branches, tags or commit ranges. In the list of missed commits, |
17 | | - it will help you identify patches which are posted for reviews on gerrit server. |
18 | | -
|
19 | | - USAGE: |
20 | | - $ ./extras/git-branch-diff.py --help |
21 | | - usage: git-branch-diff.py [-h] [-s SOURCE] -t TARGET [-a AUTHOR] [-p PATH] |
22 | | - [-o OPTIONS] |
23 | | -
|
24 | | - git wrapper to diff local or remote branches/tags/commit-ranges |
25 | | -
|
26 | | - optional arguments: |
27 | | - -h, --help show this help message and exit |
28 | | - -s SOURCE, --source SOURCE |
29 | | - source pattern, it could be a branch, tag or a commit |
30 | | - range |
31 | | - -t TARGET, --target TARGET |
32 | | - target pattern, it could be a branch, tag or a commit |
33 | | - range |
34 | | - -a AUTHOR, --author AUTHOR |
35 | | - default: git config name/email, to provide multiple |
36 | | - specify comma separated values |
37 | | - -p PATH, --path PATH show source and target diff w.r.t given path, to |
38 | | - provide multiple specify space in between them |
39 | | - -o OPTIONS, --options OPTIONS |
40 | | - add other git options such as --after=<>, --before=<> |
41 | | - etc. experts use; |
42 | | -
|
43 | | - SAMPLE EXECUTIONS: |
44 | | - $ ./extras/git-branch-diff.py -t origin/release-3.8 |
45 | | -
|
46 | | - $ ./extras/git-branch-diff.py -s local_branch -t origin/release-3.7 |
47 | | -
|
48 | | - $ ./extras/git-branch-diff.py -s 4517bf8..e66add8 -t origin/release-3.7 |
49 | | - $ ./extras/git-branch-diff.py -s HEAD..c4efd39 -t origin/release-3.7 |
50 | | -
|
51 | | - $ ./extras/git-branch-diff.py -t v3.7.11 --author="[email protected]" |
52 | | - $ ./extras/git-branch-diff.py -t v3.7.11 --author="authorX, authorY, authorZ" |
53 | | -
|
54 | | - $ ./extras/git-branch-diff.py -t origin/release-3.8 --path="xlators/" |
55 | | - $ ./extras/git-branch-diff.py -t origin/release-3.8 --path="./xlators ./rpc" |
56 | | -
|
57 | | - $ ./extras/git-branch-diff.py -t origin/release-3.6 --author="*" |
58 | | - $ ./extras/git-branch-diff.py -t origin/release-3.6 --author="All" |
59 | | - $ ./extras/git-branch-diff.py -t origin/release-3.6 --author="Null" |
60 | | -
|
61 | | - $ ./extras/git-branch-diff.py -t v3.7.11 --options="--after=2015-03-01 \ |
62 | | - --before=2016-01-30" |
63 | | -
|
64 | | - DECLARATION: |
65 | | - While backporting commit to another branch only subject of the patch may |
66 | | - remain unchanged, all others such as commit message, commit Id, change Id, |
67 | | - bug Id, may be changed. This script works by taking commit subject as the |
68 | | - key value for comparing two git branches, which can be local or remote. |
69 | | -
|
70 | | - Note: This script may ignore commits which have altered their commit subjects |
71 | | - while backporting patches. Also this script doesn't have any intelligence to |
72 | | - detect squashed commits. |
73 | | -
|
74 | | - AUTHOR: |
75 | | - Prasanna Kumar Kalever <[email protected]> |
76 | | -""" |
| 3 | +# |
| 4 | +# Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com> |
| 5 | +# This file is part of GlusterFS. |
| 6 | + |
| 7 | +# This file is licensed to you under your choice of the GNU Lesser |
| 8 | +# General Public License, version 3 or any later version (LGPLv3 or |
| 9 | +# later), or the GNU General Public License, version 2 (GPLv2), in all |
| 10 | +# cases as published by the Free Software Foundation. |
| 11 | +# |
| 12 | + |
| 13 | +# |
| 14 | +# ABOUT: |
| 15 | +# This script helps in visualizing backported and missed commits between two |
| 16 | +# different branches, tags or commit ranges. In the list of missed commits, |
| 17 | +# it will help you identify patches which are posted for reviews on gerrit server. |
| 18 | + |
| 19 | +# USAGE: |
| 20 | +# $ ./extras/git-branch-diff.py --help |
| 21 | +# usage: git-branch-diff.py [-h] [-s SOURCE] -t TARGET [-a AUTHOR] [-p PATH] |
| 22 | +# [-o OPTIONS] |
| 23 | + |
| 24 | +# git wrapper to diff local or remote branches/tags/commit-ranges |
| 25 | + |
| 26 | +# optional arguments: |
| 27 | +# -h, --help show this help message and exit |
| 28 | +# -s SOURCE, --source SOURCE |
| 29 | +# source pattern, it could be a branch, tag or a commit |
| 30 | +# range |
| 31 | +# -t TARGET, --target TARGET |
| 32 | +# target pattern, it could be a branch, tag or a commit |
| 33 | +# range |
| 34 | +# -a AUTHOR, --author AUTHOR |
| 35 | +# default: git config name/email, to provide multiple |
| 36 | +# specify comma separated values |
| 37 | +# -p PATH, --path PATH show source and target diff w.r.t given path, to |
| 38 | +# provide multiple specify space in between them |
| 39 | +# -o OPTIONS, --options OPTIONS |
| 40 | +# add other git options such as --after=<>, --before=<> |
| 41 | +# etc. experts use; |
| 42 | + |
| 43 | +# SAMPLE EXECUTIONS: |
| 44 | +# $ ./extras/git-branch-diff.py -t origin/release-3.8 |
| 45 | + |
| 46 | +# $ ./extras/git-branch-diff.py -s local_branch -t origin/release-3.7 |
| 47 | + |
| 48 | +# $ ./extras/git-branch-diff.py -s 4517bf8..e66add8 -t origin/release-3.7 |
| 49 | +# $ ./extras/git-branch-diff.py -s HEAD..c4efd39 -t origin/release-3.7 |
| 50 | + |
| 51 | +# $ ./extras/git-branch-diff.py -t v3.7.11 --author="[email protected]" |
| 52 | +# $ ./extras/git-branch-diff.py -t v3.7.11 --author="authorX, authorY, authorZ" |
| 53 | + |
| 54 | +# $ ./extras/git-branch-diff.py -t origin/release-3.8 --path="xlators/" |
| 55 | +# $ ./extras/git-branch-diff.py -t origin/release-3.8 --path="./xlators ./rpc" |
| 56 | + |
| 57 | +# $ ./extras/git-branch-diff.py -t origin/release-3.6 --author="*" |
| 58 | +# $ ./extras/git-branch-diff.py -t origin/release-3.6 --author="All" |
| 59 | +# $ ./extras/git-branch-diff.py -t origin/release-3.6 --author="Null" |
| 60 | + |
| 61 | +# $ ./extras/git-branch-diff.py -t v3.7.11 --options="--after=2015-03-01 \ |
| 62 | +# --before=2016-01-30" |
| 63 | + |
| 64 | +# DECLARATION: |
| 65 | +# While backporting commit to another branch only subject of the patch may |
| 66 | +# remain unchanged, all others such as commit message, commit Id, change Id, |
| 67 | +# bug Id, may be changed. This script works by taking commit subject as the |
| 68 | +# key value for comparing two git branches, which can be local or remote. |
| 69 | + |
| 70 | +# Note: This script may ignore commits which have altered their commit subjects |
| 71 | +# while backporting patches. Also this script doesn't have any intelligence to |
| 72 | +# detect squashed commits. |
| 73 | + |
| 74 | +# AUTHOR: |
| 75 | +# Prasanna Kumar Kalever <[email protected]> |
| 76 | +# |
77 | 77 |
|
78 | 78 | from __future__ import print_function |
79 | 79 |
|
|
0 commit comments