summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #5 - Adjust shebang to use python2Jonathan Druart2020-08-141-1/+1
| | | | | | | | | | | | 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
* Allow to use git-credential to retrieve Bugzilla username and passwordJulian Maurice2018-01-181-11/+52
| | | | | | | | | | | | | | | | | | | | | 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)
* Only edit the first commitJonathan Druart2017-03-171-1/+3
| | | | | Usually when I use `git bz attach -e` I only want to edit the first commit to change the status and obsolete the patches.
* Apply dependencies on cascadeJonathan Druart2016-09-081-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge remote-tracking branch 'kc/fishsoup' into kcfishsoupChris Cormack2015-07-131-1/+2
|\
| * Fixing utf-8 encoding issues. Special utf-8 characters can now be used in ↵Justin2015-01-151-1/+2
| | | | | | | | commit messages. Added a definition header for the source code encoding.
* | Fix for git-bz to deal with the fact the output of changing a status has ↵Chris Cormack2015-07-131-2/+1
|/ | | | changed slightly
* teach git-bz how to deal with BZ's CSRF protectionGalen Charlton2014-04-201-1/+22
| | | | | | | 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>
* Teach git-bz to update dependsonHugh Davenport2013-07-101-4/+37
| | | | | | | | | 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>
* Merge branch 'master' of git://git.fishsoup.net/git-bz into fishsoupJared Camins-Esakov2013-07-101-1/+1
|\
| * Fix typo: Uncommment => uncommentOwen W. Taylor2013-02-141-1/+1
| | | | | | | | Pointed out by Dan Winship
* | Don't choke on UTF-8 chars in bugzilla summaries when writing commit templates.Trevor Saunders2013-06-241-1/+1
| | | | | | | | | | Conflicts: git-bz
* | Get a new token for each attachment.Bobby Holley2013-06-241-14/+19
| |
* | Merge remote-tracking branch 'kc/fishsoup' into HEADChris Cormack2013-06-241-5/+46
|\ \
| * | Make changing status and patch complexity at the same time workJared Camins-Esakov2013-01-171-5/+9
| | |
| * | Teach git-bz to update patch-complexityHugh Davenport2013-01-171-3/+40
| | | | | | | | | | | | | | | | | | | | | Note that this commit hardcodes the complexities relevant for the Koha project. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
* | | Use the CSRF token from the attachment page, rather than the bug page, when ↵Bobby Holley2013-06-241-0/+14
|/ / | | | | | | | | | | | | | | 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
* | Don't add user to CC list so that updating status will workJared Camins-Esakov2012-11-101-1/+1
| |
* | Add a missing declarationJared Camins-Esakov2012-11-101-0/+1
| |
* | Add README to fishsoupJared Camins-Esakov2012-11-061-0/+15
| |
* | Fix merge errorJared Camins-Esakov2012-11-061-1/+1
| |
* | Teach git-bz to optionally sign off when applying patchesJared Camins-Esakov2012-11-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | add support to email patch to 'koha-patches' mailing-list, using --mail argMason James2012-11-061-1/+25
| | | | | | | | | | | | Conflicts: git-bz
* | Teach git-bz to update bug statusesJared Camins-Esakov2012-11-061-7/+43
| | | | | | | | | | | | | | | | | | Note that this commit hardcodes the statuses relevant for the Koha project. Conflicts: git-bz
* | Add support for bz-user and bz-password and authenticating directly.software.coop worker2012-11-062-13/+50
| | | | | | | | | | | | Conflicts: git-bz
* | Typo fixChris Cormack2012-11-061-1/+1
| |
* | Fixing a little copy and paste error with auth-user and auth-passwordChris Cormack2012-11-061-1/+1
|/
* Add support for epiphany 3.6Bastien Nocera2012-08-071-3/+7
| | | | | | Cookie jar got migrated from ~/.gnome2/epiphany to ~/.config/epiphany https://bugzilla.gnome.org/show_bug.cgi?id=676241
* attach: Obsolete patches with the same subjectJasper St. Pierre2012-03-132-1/+11
| | | | | | | | | 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
* apply: fix typoOwen W. Taylor2012-03-011-1/+1
| | | | """ not """"
* apply: Fix addition of 'need commit message' stringOwen W. Taylor2012-03-011-1/+2
| | | | | Fix a double addition of the commit message, and add a comment pointing out that the exact string is checked by git.gnome.org.
* apply: ask the user to double-check author and subjectOwen W. Taylor2012-03-011-0/+6
| | | | | | 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.
* apply: pass _interactive=True when running 'git commit --amend'Owen W. Taylor2012-03-011-2/+2
| | | | | If the editor uses the terminal, the missing _interactive=True will cause things to hang.
* apply: attempt to handle plain diffsDan Winship2012-03-012-2/+34
| | | | | | | | | 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
* apply: add --continue/--skip/--abortDan Winship2012-03-012-45/+128
| | | | | | | | | | | 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
* apply: add interactive optionDan Winship2012-03-012-10/+58
| | | | | | | | | | | | | 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
* apply: pass "-3" to git-amDan Winship2012-03-011-1/+1
| | | | | | | | | | 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
* Work around line-break problemsOwen W. Taylor2012-03-011-0/+1
| | | | | | | | | | | | | | | | | 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
* Fix up documentation generation rulesOwen W. Taylor2012-03-011-0/+4
|
* Don't strip leading space from the commit bodyOwen W. Taylor2012-02-101-4/+15
| | | | | | | 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>
* Fix parameter mistake from last patchOwen W. Taylor2012-02-071-2/+2
| | | | Pass all the necessary fields to merge_default_fields_from_dict().
* Make setting default-product, default-component in tracker config workOwen W. Taylor2012-02-061-14/+30
| | | | | | 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".
* Support pretty bugzilla links like https://bugzilla.gnome.org/12345Colin Walters2012-02-061-2/+14
| | | | | | | 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
* Allow setting bz.default-<field name>Owen W. Taylor2012-02-052-7/+40
| | | | | | | | | | | 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
* Read bz.* git config upfrontOwen W. Taylor2012-02-051-38/+31
| | | | | | | 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>.
* Add defaults for bugs.gentoo.org.Michał Górny2012-02-041-0/+7
|
* Add the user to the cc: on the bugOwen W. Taylor2012-02-041-2/+4
| | | | | | | | | | | | | | 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
* Fix a copy and paste error with auth-user and auth-passwordChris Cormack2012-02-041-2/+2
|
* Spelling correctionYawar Amin2012-02-041-2/+2
|
* Handle Unicode bug titles correctlyOwen W. Taylor2012-02-041-1/+1
| | | | | | | | 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