1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From: ryneeverett <ryneeverett@gmail.com>
Date: Thu, 31 Dec 2020 19:48:58 +0000
Subject: Fix duplicate completed task exception.
This implementation aims to be a more performant alternative to #796 by
avoiding an extra taskwarrior query on each loop.
---
bugwarrior/db.py | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/bugwarrior/db.py b/bugwarrior/db.py
index 6ddc2ab..fc1a1d6 100644
--- a/bugwarrior/db.py
+++ b/bugwarrior/db.py
@@ -182,9 +182,20 @@ def find_taskwarrior_uuid(tw, keys, issue):
('status', 'completed')
],
})
- possibilities = possibilities | set([
- task['uuid'] for task in results
- ])
+ new_possibilities = set([task['uuid'] for task in results])
+ # Previous versions of bugwarrior did not allow for reopening
+ # completed tasks, so there could be multiple completed tasks
+ # for the same issue if it was closed and reopened before that.
+ if len(new_possibilities) > 1 and all(
+ r['status'] == 'completed' for r in results):
+ for r in results[1:]:
+ for k in key_list:
+ if r[k] != results[0][k]:
+ break
+ else:
+ # All results are completed duplicates.
+ new_possibilities = set([new_possibilities.pop()])
+ possibilities = possibilities | new_possibilities
if len(possibilities) == 1:
return possibilities.pop()
|
