Merge lp:~wallyworld/bzr4j/less-strict-xml-parsing into lp:bzr4j
Status: | Merged |
---|---|
Merged at revision: | 46 |
Proposed branch: | lp:~wallyworld/bzr4j/less-strict-xml-parsing |
Merge into: | lp:bzr4j |
Diff against target: |
11 lines (+1/-0) 1 file modified
modules/core/src/main/java/org/emergent/bzr4j/core/cli/BzrXmlResult.java (+1/-0) |
To merge this branch: | bzr merge lp:~wallyworld/bzr4j/less-strict-xml-parsing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Patrick Woodworth | Pending | ||
Review via email: mp+35789@code.launchpad.net |
Commit message
Make bzr xmlstatus parsing less strict to handle "bad" bzr xml output.
Description of the change
When the plugin gathers info on changes, it runs bzr xmlstatus
If the resulting xml (as output by bzr) has issues, the xerces parser throws an exception and the plugin operation aborts. eg
2010-09-17 17:55:29,197 [ 148235] WARN - e.xmloutput.
org.xml.
at org.apache.
at org.apache.
An example of some bad xml is:
<file fid="x_
This is actual bzr output. The problem is that the fid attribute contains a '<' character.
By telling the xml parser to be less strict, the above issue is ignored and the plugin works correctly. Without the fix, changed files are not highlighted and change indicators in the gutter margins do not stick after the file is saved.