treewidget: versioned file matched ignore pattern treated as ignored - wrong
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Fix Released
|
Critical
|
Alexander Belchenko |
Bug Description
Today treewidget.py has assumption that result of bzrlib.
=== modified file 'lib/treewidget.py'
--- lib/treewidget.py 2009-11-18 10:07:55 +0000
+++ lib/treewidget.py 2009-11-24 12:16:02 +0000
@@ -218,8 +218,9 @@
[7]: executable -> 2-tuple (bool/None, bool/None)
--optional--
- [8]: is_ignored -> If the file is ignored, pattern which caused it to
- be ignored, otherwise None.
+ [8]: ignore_pattern -> If the file name matches ignore pattern then
+ this value holds corresponding pattern,
+ otherwise None.
NOTE: None value used for non-existing entry in corresponding
tree, e.g. for added/deleted/
@@ -280,11 +281,16 @@
return (desc[3] == (False, True) and desc[6][1] is None)
def is_ignored(desc):
+ """Returns ignore pattern if file is ignored;
+ None if none pattern match;
+ False is there is pattern but file actually versioned.
+ """
if len(desc) > 8:
- return desc[8]
+ # ignored is when file match ignore pattern and not versioned
+ return desc[8] and desc[3] == (False, False)
else:
return None
-
+
def status(desc):
if len(desc) == 8:
But it's not very clear how it affected other parts of QBzr which is used current API.
Gary, can you comment?
Related branches
- Gary van der Merwe: Approve
- QBzr Developers: Pending requested
-
Diff: 47 lines (+12/-4)2 files modifiedNEWS.txt (+2/-0)
lib/treewidget.py (+10/-4)
Changed in qbzr: | |
status: | New → Won't Fix |
status: | Won't Fix → In Progress |
importance: | Undecided → Critical |
assignee: | nobody → Alexander Belchenko (bialix) |
milestone: | none → 0.17 |
Changed in qbzr: | |
status: | In Progress → Fix Released |