bzr-gtk should not try to expand config options where none are expected
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Invalid
|
Undecided
|
Unassigned | ||
Bazaar GTK+ Frontends |
Fix Committed
|
High
|
Vincent Ladeuil |
Bug Description
This is likely a consequence of:
https:/
After upgrading to version 2.6, we get errors like this:
bzr commit -m 'fix for {Write,
Committing to:...
modified README
Committed revision 4819.
bzr uncommit
4819 Guilhem Bichot 2013-02-25
fix for {Write,
The above revision(s) will be removed.
Uncommit these revisions? ([y]es, [n]o): yes
You can restore the old tip by running:
bzr pull . -r revid:<email address hidden>
bzr gci
bzr: ERROR: Option Write,Update is not defined while expanding "fix for {Write,
What happens:
* "uncommit" has saved the commit comments of the uncommitted revision into an option in branch.conf, so that they can be picked up again by a later "bzr gci"
* "gci" tries to read the option, but this now uses expansion (starting from version 2.6), and it turns out that {Write,Update} is recognized as syntax for expansion. Then it fails.
Apart from not using {} in our comments, is there a workaround? Will this be fixed in bzr or in bzr-gtk?
bzr-gtk is gtk 0.104.0dev. bzr 2.6b2.
Related branches
- John A Meinel: Approve
- Richard Wilbur: Approve
- Jelmer Vernooij (community): Approve
-
Diff: 158 lines (+35/-23)3 files modifiedNEWS (+4/-0)
commitmsgs.py (+4/-3)
tests/test_commit.py (+27/-20)
Changed in bzr-gtk: | |
status: | Confirmed → In Progress |
summary: |
- Expansion in variables defined in branch.conf breaks bzr-gtk + bzr-gtk should not try to expand config options where none are expected |
Changed in bzr-gtk: | |
importance: | Undecided → High |
assignee: | nobody → Vincent Ladeuil (vila) |
Changed in bzr-gtk: | |
status: | In Progress → Fix Committed |
My thought would be to have an easy way to make sure strings are properly quoted when writing out the data, possibly via a change in either bzr-gtk or in bzr.