1. 23 Dec, 2012 1 commit
    • Kai Willadsen's avatar
      Pack FileDiff file selectors into a box to allow for future replacement · 85011d5c
      Kai Willadsen authored
      Different file selectors (i.e., history based or similar) will need a
      different selector, but repacking things in the table is messy, and
      plays havoc with keeping consistent column sizing. This commit adds
      currently-unused HBoxes around the file selectors, and sticks them in
      a size group to ensure that we get consistent column sizes.
      85011d5c
  2. 22 Dec, 2012 1 commit
  3. 21 Dec, 2012 2 commits
    • Piotr Piastucki's avatar
      Clean up matchers.py · d9cb9e9f
      Piotr Piastucki authored
      This commit removes "snakes" array which was useful for debugging but
      it is not needed anymore and adds some documentation to postprocess()
      method.
      d9cb9e9f
    • Kai Willadsen's avatar
      Fix recent focus pane mishap · eaa704bf
      Kai Willadsen authored
      Unsetting the focus pane sounds like the right thing to do, but it
      breaks our Find bar. For find-like operations, performing the action on
      the most recently focused pane seems like the right thing to do.
      eaa704bf
  4. 20 Dec, 2012 1 commit
    • Kai Willadsen's avatar
      Handle recent-file reading of malformed files (closes bgo#690472) · 2342abca
      Kai Willadsen authored
      While it's not entirely clear how this could happen, some non-meldcmp
      files can end up in Meld's recent file list. While we check for
      configparser files that don't match the layout we expect, we don't
      check for recent files that aren't even configparser files. This commit
      adds such a check.
      
      It's entirely possible that the cause of this problem is simply
      development changes, but the error handling is a good idea anyway.
      2342abca
  5. 19 Dec, 2012 2 commits
  6. 16 Dec, 2012 8 commits
  7. 12 Dec, 2012 1 commit
  8. 11 Dec, 2012 3 commits
    • Kai Willadsen's avatar
      Adjust _vc.call() to explicitly discard all subprocess output · 694e35a5
      Kai Willadsen authored
      Since call() should only ever be used to check the return value of a
      command, there's no point asking for a pipe to the output. In fact,
      asking for a pipe causes issues when the output exceeds the internal
      buffers and stalls. This patch remedies both the semantic and practical
      problem by explicitly dropping stdout and stderr into os.devnull.
      694e35a5
    • Kai Willadsen's avatar
      Handle Bazaar conflict status · 1d86f50b
      Kai Willadsen authored
      Because Bazaar doesn't actually specify conflict statuses on the same
      line as other statuses, we need to explicitly cope with the extra
      conflict status listing. This patch adds a hacky regex-based workaround
      that rewrites conflict status lines and updates Meld's path-state map
      accordingly.
      1d86f50b
    • Kai Willadsen's avatar
      Unify some pane focus handling in MeldDoc · e03492ac
      Kai Willadsen authored
      e03492ac
  9. 10 Dec, 2012 1 commit
  10. 09 Dec, 2012 2 commits
  11. 08 Dec, 2012 11 commits
  12. 06 Dec, 2012 2 commits
  13. 02 Dec, 2012 3 commits
  14. 30 Nov, 2012 2 commits