bzr4j

Conflict in working project causes NPE in IDEA

Bug #587035 reported by Jeff Kinzer
12
This bug affects 2 people
Affects Status Importance Assigned to Milestone
bzr4j
Fix Released
High
Patrick Woodworth
bzr4j release-2.4.2

Bug Description

When I update the Changes view in IntelliJ after doing a merge (from the command line) that results in a conflict, I get the following:

null
java.lang.NullPointerException
 at java.io.File.<init>(File.java:305)
 at org.emergent.bzr4j.intellij.provider.BzrChangeProvider$MyStatusHandler.processRenamed(BzrChangeProvider.java:295)
 at org.emergent.bzr4j.intellij.provider.BzrChangeProvider$MyStatusHandler.processGenericChange(BzrChangeProvider.java:260)
 at org.emergent.bzr4j.intellij.provider.BzrChangeProvider$MyStatusHandler.processResults(BzrChangeProvider.java:233)
 at org.emergent.bzr4j.intellij.provider.BzrChangeProvider.process(BzrChangeProvider.java:179)
 at org.emergent.bzr4j.intellij.provider.BzrChangeProvider.getChanges(BzrChangeProvider.java:93)
 at com.intellij.openapi.vcs.changes.ChangeListManagerImpl.a(ChangeListManagerImpl.java:432)
 at com.intellij.openapi.vcs.changes.ChangeListManagerImpl.a(ChangeListManagerImpl.java:355)
 at com.intellij.openapi.vcs.changes.ChangeListManagerImpl.access$600(ChangeListManagerImpl.java:63)
 at com.intellij.openapi.vcs.changes.ChangeListManagerImpl$ActualUpdater.execute(ChangeListManagerImpl.java:267)
 at com.intellij.openapi.vcs.changes.UpdateRequestsQueue$MyRunnable$1.consume(UpdateRequestsQueue.java:193)
 at com.intellij.openapi.vcs.changes.UpdateRequestsQueue$MyRunnable$1.consume(UpdateRequestsQueue.java:191)
 at com.intellij.openapi.vcs.changes.ExecutorWrapper$3.run(ExecutorWrapper.java:105)
 at com.intellij.openapi.application.impl.ApplicationImpl$5.run(ApplicationImpl.java:329)
 at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:619)
 at com.intellij.openapi.application.impl.ApplicationImpl$1$1.run(ApplicationImpl.java:125)

IDEA is then in a state where it will not show the changes. This is with bzr4IntelliJ 2.4.1.

Revision history for this message
Cristian Vasile Mocanu (cvmocanu) wrote :

I get this exception when I do a normal rename for a file which is versioned.

After the rename, indeed refreshing the Changes view will result in the same exception. This results in huge loss of functionality (can't see what I modified anymore) until the next time I comming externally (using the command line of TortoiseBzr).

Please fix this and try to make the IntelliJ support a little more stable. This can be done quite effectively if bzr4j developer(s) "eat their own dog food", that is, they use IntelliJ for all Bazaar related operations.

Bazaar is indeed a wonderful versioning system and it seems its developers are the only ones that understood that versioning renames on both files and directories is an absolute MUST.

But until IntelliJ gets more stable Bazaar support, unfortunately I can't "sell" Bazaar to my colleagues...

Patrick Woodworth (sixseve)
Changed in bzr4j:
status: New → Fix Released
importance: Undecided → High
assignee: nobody → Patrick Woodworth (sixseve)
Patrick Woodworth (sixseve)
Changed in bzr4j:
milestone: none → release-2.4.2
Revision history for this message
Cristian Vasile Mocanu (cvmocanu) wrote :

Thank you for fixing this.

Keep up the good job!

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.