Permalink
Switch branches/tags
Commits on Jan 5, 2012
  1. Support viewing Git diffs using the project's default encoding

    jcheng5 committed Jan 5, 2012
    Project encoded files need to be translated to UTF-8 for them to appear properly in the UI layer. However, when sending patches back to the server, we need to make sure to translate back to the project encoding before applying, or else you will end up with mixed encodings in the file.
    
    If the diff cannot be translated from project encoding to UTF-8 (probably because the file is not actually encoded using the project encoding) then we effectively just treat it as UTF-8. In this case we remember not to do UTF-8=>project encoding when we apply patches based on this diff.
Commits on Jan 4, 2012
  1. Fix 2193: staging and discarding of chunks doesn't work in files with…

    jcheng5 committed Jan 4, 2012
    … U U status (so should be disabled)
  2. Fix 2103: reverting a multiple selection that includes a new file (st…

    jcheng5 committed Jan 4, 2012
    …atus: ? ?) fails silently
  3. Revert "2199: regression - matching parentheses not deleted"

    jcheng5 committed Jan 4, 2012
    Using behaviors doesn't work right because we can no longer distinguish between deleting left (backspace) and deleting right (delete); we only want to do the special logic for the former case.
    
    This reverts commit c894905.
  4. 2199: regression - matching parentheses not deleted

    jcheng5 committed Jan 4, 2012
    Our monkeypatch of Ace's removeLeft() function broke because removeLeft() was refactored as part of the introduction of editor behaviors. To fix, I refactored our removeLeft() monkeypatch into a behavior (which then has to be monkeypatched into TextMode, unfortunately).
    
    The insert() monkeypatch (that actually puts in matching braces) I left alone since it seems to be working right now, but there's every chance it will also break in the future and then we'd need to refactor that as well.
  5. bring back ssh key chooser

    jjallaire committed Jan 4, 2012
Commits on Jan 3, 2012
  1. tweak ignore path again

    jjallaire committed Jan 3, 2012
  2. fix indentation

    jjallaire committed Jan 3, 2012
  3. bundle msys ssh

    jjallaire committed Jan 3, 2012
  4. remove outdated reference to emailing info@rstudio.org for source acc…

    jjallaire committed Jan 3, 2012
    …ess (repo is publicly available)
  5. set HOME to USERPROFILE for windows shell invocations (so msys ssh ca…

    jjallaire committed Jan 3, 2012
    …n find the .ssh directory)
  6. don't show error dialogs for svn history errors

    jjallaire committed Jan 3, 2012
    in almost all foreseeable cases the error will already be displayed in the console process dialog
  7. eliminate eclipse warnings

    jjallaire committed Jan 3, 2012