Merge lp:~jayrod/qbzr/bug1030343 into lp:qbzr

[Jared Silva]

fix bug 1030343

[Alexander Belchenko (bialix)]

Have you tested this fix?

You've put your news item in the middle of the existing section. That news section is related to already released version of qbzr. Please, move your news to upmost section releated to unreleased version of qbzr.

review: Needs Fixing

[Alexander Belchenko (bialix)]

OK, I saw your comments to bug about testing. That's OK for me. Thank you for your patch! I will update news while landing your patch.

review: Approve

[Jared Silva (jayrod)]

Sorry, I did not realize this was the first change in the next
release. Thanks for the help. My first patch on lp :)

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-07-12 14:08:31 +0000
+++ NEWS.txt	2012-08-03 05:19:24 +0000
@@ -39,6 +39,9 @@
      (Alexander Belchenko, Bug #878204)
  * qbind:
    * Add push location to suggestions. (Alexander Belchenko)
+ * qcommit:
+   * Better support of cancel commit for git branch.
+     (Bug #1030343, Jared Silva, Jelmer Vernooij)
  * qconflicts:
    * Added 2 resolve actions to context menu: `Take "THIS"` 
      and `Take "OTHER"`. (Alexander Belchenko)

=== modified file 'lib/commit.py'
--- lib/commit.py	2012-04-12 04:49:37 +0000
+++ lib/commit.py	2012-08-03 05:19:24 +0000
@@ -600,7 +600,7 @@
             self.bugsCheckBox.setChecked(True)
 
     def save_commit_data(self):
-        if (self.tree.branch.control_files.get_physical_lock_status()
+        if (self.tree.branch.get_physical_lock_status()
             or self.tree.branch.is_locked()):
             # XXX maybe show this in a GUI MessageBox (information box)???
             from bzrlib.trace import warning