| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
| |
Usually when I use `git bz attach -e` I only want to edit the first
commit to change the status and obsolete the patches.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\ |
|
| |
| |
| |
| | |
commit messages. Added a definition header for the source code encoding.
|
|/
|
|
| |
changed slightly
|
|
|
|
|
|
|
| |
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>
|
|\ |
|
| |
| |
| |
| | |
Pointed out by Dan Winship
|
| |
| |
| |
| |
| | |
Conflicts:
git-bz
|
| | |
|
|\ \ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Note that this commit hardcodes the complexities relevant for the Koha
project.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
attaching files.
This fixes breakage caused by a recent BMO change.
A similar change was made to bzapi: http://hg.mozilla.org/webtools/bzapi/rev/5ca3562f2e6c
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
Conflicts:
git-bz
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Note that this commit hardcodes the statuses relevant for the Koha
project.
Conflicts:
git-bz
|
| |
| |
| |
| |
| |
| | |
Conflicts:
git-bz
|
| | |
|
|/ |
|
|
|
|
|
|
| |
Cookie jar got migrated from ~/.gnome2/epiphany to ~/.config/epiphany
https://bugzilla.gnome.org/show_bug.cgi?id=676241
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
""" not """"
|
|
|
|
|
| |
Fix a double addition of the commit message, and add a comment
pointing out that the exact string is checked by git.gnome.org.
|
|
|
|
|
|
| |
The author and subject might be wrong (especially the subject), when
we make up a commit message for a plain patch, so ask the user to
double check.
|
|
|
|
|
| |
If the editor uses the terminal, the missing _interactive=True will
cause things to hang.
|
|
|
|
|
|
|
|
|
| |
If a bug has a plain diff (as opposed to git-format-patch output),
prepend some minimal headers to it to get it into a format git-am will
accept, and then make the user write a commit message for it before
proceeding.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
|
|
|
|
|
|
|
|
|
|
|
| |
Rather than failing completely when git-am fails to apply a patch,
write out our current state to git-am's temporary directory, and then
tell the user to use "git bz apply --continue/--skip/--abort" after
handling the merge failure. When the user uses one of those options,
read back our state, pass the flag on to git-am, and (assuming git-am
succeeds), continue with the next patch.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rather than asking whether or not to apply each patch individually,
list all of the patches at once and allow the user to either apply all
of them, apply none of them, or interactively choose which ones to
apply (a la interactive rebasing).
In addition to choosing which patches to apply, the interactive option
also allows reordering the patches before applying, and choosing to
apply committed or rejected patches.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
|
|
|
|
|
|
|
|
|
|
| |
Using 3-way merge makes it much more likely that the patch will apply
correctly when the local tree is newer than the tree that the patch
was generated from, and if the patch doesn't apply cleanly, git will
leave a file with conflict markers rather than forcing you to reapply
the patch manually.
https://bugzilla.gnome.org/show_bug.cgi?id=657558
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The two lines for the different versions of 'git bz edit' are treated
by asciidoc as a single paragraph and line-wrapped.
In theory, a + at the end of a line is a forced line-break with
asciidoc, but in the manpage generation route, this doesn't work
properly - the magic in a2x that is supposed to turn the asciidoc-br
processing instruction into a line break doesn't work. (We aren't
using a2x at the moment for the conversion, but no real reason to
switch if it doesn't work better.)
So, use a [verse] paragraph instead. This results in mis-indentation,
but slightly better than the previous breakage.
https://bugzilla.gnome.org/show_bug.cgi?id=670686
|
| |
|
|
|
|
|
|
|
| |
If we strip leading space from the body, we'll unindent the
first line of the body, which could break aligment.
Based on a patch by Stef Walter <stefw@gnome.org>
|
|
|
|
| |
Pass all the necessary fields to merge_default_fields_from_dict().
|
|
|
|
|
|
| |
Allow setting the default-product in the tracker config. This is possibly
useful for something like bugzilla.redhat.com where many repositories share
a product of "Fedora".
|
|
|
|
|
|
|
| |
Ideally I'd like git-bz to know when a Bugzilla instance supports
these, but here at least we'll try parsing them.
https://bugzilla.gnome.org/show_bug.cgi?id=657361
|
|
|
|
|
|
|
|
|
|
|
| |
If you want to override something like the default version on a per-component
basis, having to set that in the per-tracker configuration is unnatural
and confusing. Allow setting bz.default-version instead. This is interpreted
as overriding the existing configuration of default field values.
Based on a patch from Dan Winship <danw@gnome.org>
https://bugzilla.gnome.org/show_bug.cgi?id=651756
|
|
|
|
|
|
|
| |
Instead of making calls to git.config() as needed, read all of our options
ahead of time into a dictionary initialized with defaults.
Loosely based on a patch from Felipe Contreras <felipe.contreras@gmail.com>.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
All the logic to add the user to the cc: list on the bug is done in the
web page for show_bug.cgi and not on the client side, so the option
"Automatically add me to the CC list of bugs I change" in the user's
preferences is not honored. Since that preference defaults to Always
and users will very typically want to see further traffic on their patches,
just always request the user to be added to the Cc.
The main downside to this is that we do another round trip to the server
when creating and attachment, and also potentially create more bug mail.
https://bugzilla.gnome.org/show_bug.cgi?id=663800
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
If the data that we are writing into the template ends includes
non-ASCII data, it will need to be encoded as UTF-8 before writing
the template file. Fix from Luca Bruno.
https://bugzilla.gnome.org/show_bug.cgi?id=657716
|