[meld] (60 commits) ...vc: Fix git's remerge helpers for py3k

[Kai Willadsen <kaiw src gnome org>]

Summary of changes:

  b0ff88a... Initial pass at Python 3 porting basics (*)
  fa4af0d... filediff/meldbuffer: Text from GTK buffers is now returned  (*)
  64551b1... tree: Don't choke if we get a bad tree path (*)
  e4faf30... meld: Update required Python version (*)
  a390838... meldapp: Python 3 import fixes (*)
  de77212... patchdialog: Python 3 and GTK 3 porting (*)
  6341fc5... filediff: Minor Python 3 unicode fixups (*)
  6fbc1c3... dirdiff: Python 3 bytes (*)
  c6a6d70... misc: 'Fix' subprocess call for unicode (*)
  7c8e387... ui.historyentry: Update to new encoding handling for unicod (*)
  8bf5cfc... meld: Update shebang line (*)
  e05bdb1... The future is now. (*)
  32c58ac... sourceview: Absolute imports (*)
  a373522... meldbuffer: Fix bad forward-port (*)
  b7954fd... vc.git: Use new py3k import (*)
  23bee65... recent: Fix str/bytes snafu (*)
  06683cb... misc: Fix fallbackdecode for py3k, and rename keyword (*)
  cd96820... meldwindow: Remove unnecessary check (*)
  6b76c19... recent: "Fix" a py3k problem by punting it to later (*)
  7ec1ac1... filediff: unicode/str (*)
  800235c... patchdialog: str/bytes (*)
  e3f3060... util.compat: Remove text_type and update users (*)
  aee0896... util.compat: Remove string_types, update users, and remove  (*)
  15fc6fa... vc: Break out helper for writing process output to a temp f (*)
  00366db... vc: Add file idenifier option for use in conflict naming, a (*)
  aef6f90... vc: Pull run helper out of the git module (*)
  b17f267... vc._vc: Move to using universal-newline mode for unicode ha (*)
  39ecd9b... vc.git: Fix string-escape for 'exciting' py3k behaviour (*)
  21e89e1... filediff: Fix for iterator changes (*)
  b7c760c... filediff: Remove text_type use; fixing bad rebase (*)
  b100130... meldbuffer: Make file loading work, with a FIXME (*)
  701e879... meld.util: Remove now-empty subpackage (*)
  42f80f4... test_filediff: Update for python 3 compat (*)
  356ca38... filters: Maintain a byte-based regex filter for folder comp (*)
  d7cbf4b... Merge branch 'master' into Python3 (*)
  2f55f30... ui.notebook: Update for Python 3 (*)
  4011cfb... meldwindow: Fix relative import (bgo#767224) (*)
  e963951... data: Fix unknown-text in meld-dark style (*)
  85ec624... misc: Fix old-style print (*)
  bc1878d... filediff: Fix DiffChunk sorting tuple-of-maybe-tuples (bgo# (*)
  262d6b1... dirdiff: Remove handling for non-UTF8 dates; these are unic (*)
  0262d3f... vc: Fix incorrect Subversion XML encoding assumptions (bgo# (*)
  d4d680a... Python 3 compatibility for messages with file names (*)
  6be761c... meldbuffer: Avoid tuple comparison with None for py3k (bgo# (*)
  1424df9... meldbuffer: Don't update recorded disk mtime for errors/mis (*)
  50a62f4... Merge branch 'master' into Python3 (*)
  df83035... ui.notebook: Handle more 3.20 CSS breakage (*)
  1b4e8cf... recent: Remove unicode/bytestring comment (*)
  2954404... newdifftab: Remove incorrect decode (*)
  c2b6904... meldbuffer: Enforce unicode filenames instead of coercing (*)
  6e2bf7e... vc.git: Fix unescaping of unicode filenames from git (*)
  0b864c3... vcview: Remove display_path(); we always handling unicode f (*)
  e8bfd11... misc: Remove unused fallback_decode() (*)
  3dca61d... vcview: Remove outdated comment (*)
  d9e3e57... vc.git: Fix commit message decoding for py3k (*)
  24f29bf... patchdialog: Remove difflib hack; in py3k difflib handles u (*)
  234f9b0... patchdialog: Fix incorrect decode for py3k GFile changes (*)
  04db92b... Merge branch 'Python3'
  47e95cd... vc._vc: Add binary output support to Vc.run()
  c1d703f... vc: Fix git's remerge helpers for py3k

(*) This commit already existed in another branch; no separate mail sent