1. 25 May, 2011 1 commit
  2. 24 May, 2011 1 commit
  3. 21 May, 2011 2 commits
  4. 15 May, 2011 1 commit
  5. 07 May, 2011 1 commit
  6. 27 Apr, 2011 1 commit
  7. 23 Apr, 2011 2 commits
  8. 22 Apr, 2011 2 commits
  9. 21 Apr, 2011 8 commits
  10. 15 Apr, 2011 2 commits
  11. 08 Apr, 2011 1 commit
  12. 07 Apr, 2011 1 commit
  13. 04 Apr, 2011 5 commits
    • Kai Willadsen's avatar
    • Kai Willadsen's avatar
      Rework LinkMap as a separate gtk.DrawingArea subclass · 67972e85
      Kai Willadsen authored
      The LinkMap is the widget that draws correspondence lines between two
      panes in our FileDiff views, and provides clickable areas for
      performing actions on change blocks. This commit isolates the LinkMap
      code into its own class and overrides signals as appropriate, rather
      than dealing with all callbacks through FileDiff.
      
      In addition, the new LinkMap widget has improved handling of
      non-writable TextViews it is associated with, which should fulfil the
      requirements associated with merge mode.
      
      meld/linkmap.py: Add new LinkMap class, with most code moved and
                       adapted from the existing implementation in FileDiff.
      
      meld/filediff.py: Remove LinkMap code and add FileDiff/LinkMap
                        integration bits. We also move to treating the
                        window-wide keymask as a property.
      
      meld/filemerge.py: Remove LinkMap code; the new LinkMap should handle
                         merge mode correctly itself.
      
      data/ui/filediff.ui: Adjust UI file to treat LinkMap as a real widget
      
      meld/util/sourceviewer.py: Add some TextView-specific APIs to our proxy
                                 widget for use in LinkMap; these APIs will
                                 be used in FileDiff, but are not currently.
      
      meld/ui/catalog.xml: Add Glade support for LinkMap
      meld/ui/gladesupport.py: Add Glade support for LinkMap
      67972e85
    • Kai Willadsen's avatar
      Update DOAP file · 97dbd555
      Kai Willadsen authored
      97dbd555
    • Jan Danielsson's avatar
      Minor enhancements to the Fossil VC plugin (closes bgo#646388) · b47fc0cc
      Jan Danielsson authored
      Add features:
      - Handle fossil's NOT_A_FILE as STATE_ERROR
      - Support more file states with revisions numbers (even though they may
        technically not be encountered without further changes).
      
      Fix issues:
      - Fossil supports renaming the repository metadata file "_FOSSIL_" to
        ".fos" -- support this.
      - Fossil doesn't detect an added file which has gone missing, so the
        vc-plugin could handle this special case.
      - Only ignore certain metafiles if they are in the repository root.
      b47fc0cc
    • Tomasz Bury's avatar
      Fix crash when displaying svn directory containing uncommitted copies · 8d7e4aff
      Tomasz Bury authored
      There's no revision information in such case, just 'copy': True.
      
      To reproduce the problem sun 'svn cp existing-file new-copy; meld .'
      8d7e4aff
  14. 31 Mar, 2011 1 commit
  15. 26 Mar, 2011 4 commits
  16. 20 Mar, 2011 3 commits
  17. 19 Mar, 2011 3 commits
  18. 16 Mar, 2011 1 commit