After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 710780 - patch: enable meld to recognise all git status codes
patch: enable meld to recognise all git status codes
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: version
git master
Other Linux
: Normal normal
: ---
Assigned To: meld-maint
meld-maint
: 726242 (view as bug list)
Depends on:
Blocks:
 
 
Reported: 2013-10-24 08:49 UTC by scytale
Modified: 2014-03-14 23:20 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
patch adding the relevant status codes (451 bytes, patch)
2013-10-24 08:49 UTC, scytale 		none Details | Review

Description scytale 2013-10-24 08:49:01 UTC 
Created attachment 257991 [details] [review]
patch adding the relevant status codes

unning recent versions of meld on my git repository has been failing with this traceback:

+ Trace 232664

  • File "/usr/local/lib/meld/meld/task.py", line 112 in iteration 
    ret = next(task)
  • File "/usr/local/lib/meld/meld/vcview.py", line 447 in _search_recursively_iter 
    self.vc.cache_inventory(rootname)
  • File "/usr/local/lib/meld/meld/vc/_vc.py", line 275 in cache_inventory 
    self._tree_cache = self._lookup_tree_cache(directory)
  • File "/usr/local/lib/meld/meld/vc/git.py", line 348 in _lookup_tree_cache 
    self._update_tree_state_cache("./", tree_state)
  • File "/usr/local/lib/meld/meld/vc/git.py", line 324 in _update_tree_state_cache 
    columns = self.diff_re.search(entry).groups()
AttributeError: 'NoneType' object has no attribute 'groups' 

This is because meld does not recognise the full set of status codes output by `git diff-index` - the regex used does not recogise the 'T' or 'X' codes. This patch fixes this.
Comment 1 Kai Willadsen 2013-11-01 20:34:52 UTC 
Thanks. I've pushed this to both 1.8 and current master.
Comment 2 Kai Willadsen 2014-03-14 23:20:04 UTC 
*** Bug 726242 has been marked as a duplicate of this bug. ***