Merge lp:~songofacandy/qbzr/qbrowse-fix into lp:qbzr

[methane]

[methane (songofacandy)]

* Can use 'F2' to start renaming.
* Fix error on end renaming without changes.

[Gary van der Merwe (garyvdm)]

review: Approve

[Gary van der Merwe (garyvdm)]

PS: INADA: I see you are now a member of qbzr-dev - so I'm leaving this for you to merge. If you want me to merge it, let me know.

[methane (songofacandy)]

I've merged this. Thank you.

On Mon, Dec 21, 2009 at 10:11 PM, Gary van der Merwe <email address hidden> wrote:
> PS: INADA: I see you are now a member of qbzr-dev - so I'm leaving this for you to merge. If you want me to merge it, let me know.
> --
> https://code.edge.launchpad.net/~songofacandy/qbzr/qbrowse-fix/+merge/16069
> You are the owner of lp:~songofacandy/qbzr/qbrowse-fix.
>

--
Naoki INADA <email address hidden>

[Alexander Belchenko (bialix)]

INADA Naoki пишет:
> I've merged this. Thank you.

Please, next time write something in the NEWS about your bugfix.

[methane (songofacandy)]

On Tue, Dec 22, 2009 at 12:45 AM, Alexander Belchenko <email address hidden> wrote:
> INADA Naoki пишет:
>> I've merged this. Thank you.
>
> Please, next time write something in the NEWS about your bugfix.

roger.

[Alexander Belchenko (bialix)]

Naoki, sorry for asking so late.

Why you're using posixpath module instead of bzrlib.osutils.pathjoin function? I think the right way is to use the latter function. Do you have any specific reasons to avoid it?

[Gary van der Merwe (garyvdm)]

On 06/01/2010 12:18, Alexander Belchenko wrote:
> Why you're using posixpath module instead of bzrlib.osutils.pathjoin
> function? I think the right way is to use the latter function. Do you
> have any specific reasons to avoid it?

I questioned that when I reviewed this. In this case, we need '/', even
on windows. This is to fix bug 495519.

https://bugs.launchpad.net/qbzr/+bug/495519

[Alexander Belchenko (bialix)]

Gary van der Merwe пишет:
> On 06/01/2010 12:18, Alexander Belchenko wrote:
>> Why you're using posixpath module instead of bzrlib.osutils.pathjoin
>> function? I think the right way is to use the latter function. Do you
>> have any specific reasons to avoid it?
>
> I questioned that when I reviewed this. In this case, we need '/', even
> on windows. This is to fix bug 495519.

Gary, osutils.pathjoin *forces* '/' on Windows. That's why I've asked
about it.

[Gary van der Merwe (garyvdm)]

On Wed, Jan 6, 2010 at 2:09 PM, Alexander Belchenko <email address hidden> wrote:
> Gary, osutils.pathjoin *forces* '/' on Windows. That's why I've asked
> about it.

Oh! Maybe it should be reverted?

[methane (songofacandy)]

> Gary, osutils.pathjoin *forces* '/' on Windows. That's why I've asked
> about it.

I haven't know about bzrlib.osutils.pathjoin!
The posixpath.join should be replaced by it.

--
Naoki INADA <email address hidden>

[Alexander Belchenko (bialix)]

INADA Naoki пишет:
>> Gary, osutils.pathjoin *forces* '/' on Windows. That's why I've asked
>> about it.
>
> I haven't know about bzrlib.osutils.pathjoin!
> The posixpath.join should be replaced by it.

OK, I will change the code to use osutils then. I think it will be more
consistent in our usage of bzrlib functions.

=== modified file 'lib/treewidget.py'
--- lib/treewidget.py	2009-12-06 15:16:30 +0000
+++ lib/treewidget.py	2009-12-12 01:39:12 +0000
@@ -18,6 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 import os, sys
+import posixpath  # to use '/' path sep in path.join().
 from time import (strftime, localtime)
 from PyQt4 import QtCore, QtGui
 from bzrlib import errors
@@ -820,7 +821,9 @@
             value = unicode(value.toString())
             item_data = self.inventory_data[index.internalId()]
             parent = self.inventory_data[item_data.parent_id]
-            new_path = os.path.join(parent.path, value)
+            new_path = posixpath.join(parent.path, value)
+            if item_data.path == new_path:
+                return False
             try:
                 if item_data.item.file_id:
                     # Versioned file
@@ -870,8 +873,11 @@
             if role == QtCore.Qt.DisplayRole:
                 return QtCore.QVariant(item.name)
             if role == QtCore.Qt.EditRole:
-                parent = self.inventory_data[item_data.parent_id]
-                return QtCore.QVariant(item_data.path[len(parent.path):])
+                path = item_data.path
+                if item_data.parent_id:
+                    parent = self.inventory_data[item_data.parent_id]
+                    path = path[len(parent.path)+1:]
+                return QtCore.QVariant(path)
             if role == QtCore.Qt.DecorationRole:
                 if item_data.icon is None:
                     if item_data.change and not item_data.change.is_on_disk():
@@ -945,12 +951,12 @@
         return QtCore.QVariant()
     
     def flags(self, index):
-        #if not index.isValid():
-        #    return QtCore.Qt.ItemIsEnabled
+        if not index.isValid():
+            return 0
         
         flags = (QtCore.Qt.ItemIsEnabled |
                  QtCore.Qt.ItemIsSelectable)
-        
+
         if isinstance(self.tree, WorkingTree):
             flags = flags | QtCore.Qt.ItemIsDragEnabled
         
@@ -958,7 +964,7 @@
             flags = flags | QtCore.Qt.ItemIsEditable
             if self.checkable:
                 flags = flags | QtCore.Qt.ItemIsUserCheckable
-        
+
         id = index.internalId()
         if id < len(self.inventory_data):
             item_data = self.inventory_data[index.internalId()]
@@ -1218,10 +1224,11 @@
 
     def __init__(self, *args):
         RevisionTreeView.__init__(self, *args)
-        
+
         self.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
         self.setUniformRowHeights(True)
-        self.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
+        self.setEditTriggers(QtGui.QAbstractItemView.SelectedClicked |
+                             QtGui.QAbstractItemView.EditKeyPressed)
         self.viewport().setAcceptDrops(True)
         self.setDropIndicatorShown(True)
         self.setDragDropMode(QtGui.QAbstractItemView.InternalMove);
@@ -1900,7 +1907,7 @@
         """Rename the selected file."""
         
         indexes = self.get_selection_indexes()
-        if len(indexes) <> 1:
+        if len(indexes) != 1:
             return
         index = indexes[0]
         index = self.tree_filter_model.mapFromSource (index)