1. 13 Jun, 2010 4 commits
  2. 12 Jun, 2010 1 commit
    • Kai Willadsen's avatar
      Remove option to edit files in Meld and simplify preference interface · 64288832
      Kai Willadsen authored
      We currently provide options to edit files in Meld, the system editor,
      or an external editor. However, Meld is not designed as a stand-alone
      editor; the system editor is almost certain to be a superior editing
      tool. This commit removes the option to edit files in Meld, leaving
      the system editor and custom editor options.
      
      This only changes the behaviour of selecting "Open" from the context
      menu in various views. Starting a 'comparison', even if on a single
      file, will always open in Meld.
      64288832
  3. 10 Jun, 2010 2 commits
  4. 07 Jun, 2010 1 commit
  5. 27 May, 2010 1 commit
  6. 25 May, 2010 4 commits
  7. 24 May, 2010 2 commits
    • Peter Tyser's avatar
      git: Update diff-logic · 84ca6e1a
      Peter Tyser authored
      Previously, meld would use the 'git diff-index HEAD' command to find out
      the status of modified files.  This command would compare the HEAD revision
      to the files on disk.  This command did not take into consideration git's
      "index" which resulted in odd behavior such as not handling unmerged files
      correctly as pointed out in https://bugzilla.gnome.org/show_bug.cgi?id=617098
      
      Separating 'git diff-index HEAD' into 'git diff-index --cached HEAD' and
      'git diff-files' proprerly accounts for git's "index".  Now modifications
      to files on disk, in the index, or unmerged files are shown in meld.
      
      Note that the current functionality isn't perfect as a user can't decide
      if they do/don't want to take git's "index" into consideration for
      their diffs.  Ideally a feature such as an "index filter" will be
      added in the future to allow finer control over if and how the contents
      of the "index" are shown.
      Signed-off-by: default avatarPeter Tyser <ptyser@gmail.com>
      84ca6e1a
    • Mario Blättermann's avatar
      Updated German translation · 581095d7
      Mario Blättermann authored
      581095d7
  8. 22 May, 2010 1 commit
  9. 21 May, 2010 4 commits
  10. 14 May, 2010 11 commits
  11. 27 Apr, 2010 2 commits
    • Peter Tyser's avatar
      Fix scanning of entire VC repository for single-file diff · 4db76df0
      Peter Tyser authored
      Previously, running meld on one file in a version-controlled directory
      would result in meld scanning the entire repository for modifications.
      The scanning of the entire repository was unnecessary and could hog
      system resources, especially on larger repositories.
      Signed-off-by: default avatarPeter Tyser <ptyser@gmail.com>
      4db76df0
    • Peter Tyser's avatar
      Fix saving of multiple modified files on quit · c695945a
      Peter Tyser authored
      Previously, file modifications could be lost when quitting meld
      when multiple diff panes were open and more than 1 of the panes
      had file modifications.  Quitting would prompt the user to
      Discard/Cancel/Save the changes in one of the modified panes.  Pressing
      "Discard Changes" would result in Meld quitting immediately without
      prompting the user if they wanted to save the other modified files.
      
      This issue only occurred if multiple files were open, eg when using
      Meld to diff/modify multiple files in a version-controlled directory.
      Signed-off-by: default avatarPeter Tyser <ptyser@gmail.com>
      c695945a
  12. 24 Apr, 2010 1 commit
    • Peter Tyser's avatar
      Fix behavior when "Save modified files?" window is closed · b7d28c37
      Peter Tyser authored
      After modifying a file, not saving the changes, and attempting to close
      the file or quit meld, a user is presented with a "Save modified
      files?" dialog window.  Previously, pressing the escape key at this window
      or closing the window would result in the modified file being closed and
      the modifications lost.  This is at odds with most other applications
      which assume when a user presses the escape key or closes the dialog
      window they only want to close the dialog window, not discard their
      modifications.  This change makes meld behave similar to other
      applications.
      Signed-off-by: default avatarPeter Tyser <ptyser@gmail.com>
      b7d28c37
  13. 19 Apr, 2010 2 commits
    • Peter Tyser's avatar
      write_pipe(): Discard stdout output · 2de0b6cc
      Peter Tyser authored
      Previously, meld would print any stdout output from a command executed
      via the write_pipe() function to the command line.  As an example:
        $ ./bin/meld ./
        (Double click on the git.py file in the meld GUI)
        patching file meld/vc/git.py
        (Double click on the _vc.py file in the meld GUI)
        patching file meld/vc/_vc.py
      
      The "patching file XYZ" output from the 'patch' command litters the
      terminal window used to execute meld and doesn't provide any useful
      information.
      
      This change discards the stdout output of a command executed via the
      write_pipe() function.  Note that stderr output will still be
      printed to the command line as it can be useful in diagnosing why
      a sub-command is having errors.
      Signed-off-by: default avatarPeter Tyser <ptyser@gmail.com>
      2de0b6cc
    • Peter Tyser's avatar
      Fix stale git status · 7a72101a
      Peter Tyser authored
      Recent commit 84524f7f replaced the use
      of "git status" with the lower-level "git diff-index".  However, when
      using "git diff-index" we need to explicitly update the index prior
      to running "git diff-index".  Previously, "git status" would
      automatically update the index prior to diffing.
      
      If the index is not explicitly updated, meld reports incorrect
      file status in certain scenarios.  For example, running:
       - sed -i 's/firefox/chrome/' GNUMakefile
       - git diff (update git's index)
       - sed -i 's/chrome/firefox/' GNUMakefile (git's index is now out of date)
       - bin/meld ./
      
      Meld will then show GNUMakefile as being modified even though its contents
      are actually unchanged.
      
      Calling "git update-index --refresh" prior to "git diff-index" resolves
      the previous stale status issue.
      Signed-off-by: default avatarPeter Tyser <ptyser@gmail.com>
      7a72101a
  14. 25 Mar, 2010 3 commits
  15. 23 Mar, 2010 1 commit
    • Kai Willadsen's avatar
      Split out DiffMap functionality into new widget · 48b455ad
      Kai Willadsen authored
      The DiffMap widget (the bars showing a coloured summary of changes at
      the left and right of the main file comparison window) has always been
      a purely custom creation based on gtk.DrawingArea. This commit breaks it
      out into a separate file and makes it a DrawingArea subclass.
      
      This also changes the drawing done, syncing the colours used with the
      LinkMap and TextView, and allowing thinner lines for insert chunks. In
      addition, our style-dependent calculations should now be more robust for
      unusual themes.
      48b455ad