If a patch fails to apply we should exit with a proper exit status so
that ansible can catch the issue in non-interactive operation for the
sandboxes.
Test plan
You can use echo $? after executing any command in the shell to see the
last commands exit code.. 0 for success, 1 for failure.
To test this patch try doing a git bz apply using a bug you know will
fail to apply, Call the echo statement above and note the exit code is
0.. after applying the patch do the same bz apply and echo and not the
exit code now properly reflects the failure state with an exit code of
1.
Bonus points is to test that the cascade apply still works as expected
for both cases of a fully successful apply and for one where one of the
dependancies fails to apply.
More bonus points, check that passing multiple bug ids also still works
If one tries to apply patches from bug 4321 that is depending on bug 1234
that is "Failed QA", the patches from 1234 will be skipped silently.
This patch suggests to apply them and display the status in the "depends
on" string displayed to the user
git bz apply 1 2 3 4
will now apply the patches from bug reports 1, 2, 3 and 4
There is a check to prevent patches from the same bug reports to be
applied.
Say you have 3 depends on 1
if you apply 1 2 3 you will have:
patches from 3
patches from 1 (if you follow the apply on cascade)
patches from 2
# patches from 1 will be skipped if applied on cascade previously
Wrong shebang under (at least) D11
% git-bz bash: /usr/bin/git-bz: /usr/bin/python: bad interpreter: No such file or directory
% ls /usr/bin/python* /usr/bin/python2 /usr/bin/python2.7 /usr/bin/python3 /usr/bin/python3.8
git-bz is using /usr/bin/python
We must specify /usr/bin/python2
This removes the need of storing non-encrypted password in git config
Configuration example:
[credential]
helper = cache --timeout 3600
[credential "https://bugs.koha-community.org"]
username = your.email@example.com
[bz-tracker "bugs.koha-community.org"]
path = /bugzilla3
https = true
use-git-credential = true
Now the first time you will use git-bz, it will ask for a password and
store it in memory (only if the login was successful).
If you use it again, it will not ask again and it will use the in-memory
cache instead
You can use other credential helper as you wish (there is a helper for
gnome-keyring for instance)
If a bug report depends on others in Needs Signoff, Signed Off or Passed
QA status, you will now be able to apply the patches from the dependent
bugs.
Note that if something is going wrong, the process won't continue as you
could expect. git bz apply --continue will continue the patch set in
conflict and not the followings.
For instance
Bug 42 depends on bug 421 and 422 which depends on bug 4221
% git bz apply 42
Bug 42 Depends on bug 421
Follow? [(y)es, (n)o] y
Bug 421 - XXX
Apply? [(y)es, (n)o, (i)nteractive]
Applying: Bug 421: commit msg 421
Bug 42 Depends on bug 422
Follow? [(y)es, (n)o] y
Bug 422 Depends on bug 4221
Follow? [(y)es, (n)o] y
Bug 4221 - XXX
Apply? [(y)es, (n)o, (i)nteractive]
Applying: Bug 4221: commit msg 4221
Bug 422 - XXX
Apply? [(y)es, (n)o, (i)nteractive]
Applying: Bug 422: commit msg 422
Bug 42 - XXX
Apply? [(y)es, (n)o, (i)nteractive]
Applying: Bug 42: commit msg 42
This is pretty hackish; it may be time to see if we can
do what we need using BZ's official web services.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Uses a commit tag Depends: which needs to map the regexp (bug)?\s*(\d+)
case insensitive. Allows multiple depends lines, and shows the current
setting of the depends.
Signed-off-by: Hugh Davenport <hugh@davenport.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Adds a -s/--signoff option for the apply action. When set, git-bz
will instruct git-am to sign off on all patches as they are being
applied.
WARNING: THIS OPTION IS INTENDED FOR USE WHEN PUSHING BRANCHES. DO
NOT USE THIS OPTION AS AN ALTERNATIVE TO ACTUALLY TESTING CODE.
Conflicts:
git-bz
For plain 'git bz attach', always obsolete existing patches if they
have the same subject as the commit being attached.
For 'git bz attach -e', make this the default.
https://bugzilla.gnome.org/show_bug.cgi?id=671941
Martin Renvoize
Julian Maurice
Andrii Nugged
Slava Shishkin
Jonathan Druart
Chris Cormack
Justin
Galen Charlton
Hugh Davenport
Jared Camins-Esakov
Trevor Saunders
Bobby Holley
Chris Cormack
Owen W. Taylor
Mason James
software.coop worker
Bastien Nocera
Jasper St. Pierre