Permalink
Switch branches/tags
Nothing to show
Commits on Oct 26, 2008
Commits on Apr 12, 2008
  1. Added code folding when there are multiple documents listed in the di…

    subtleGradient committed Apr 12, 2008
    …ff. Makes it much easier to read.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@9370 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 18, 2008
  1. • update commands to show “There are no differences.” when there are …

    sorbits committed Mar 18, 2008
    …no differences. Also a few other minor improvements, like aborting the file requester no longer shows an error message, etc.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@9155 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Feb 22, 2008
  1. Tighten up the firstLineMatch for the context diff format, was catchi…

    infininight committed Feb 22, 2008
    …ng various maude files.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@8977 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 4, 2007
  1. • update my email address (from a throw-away address to something a l…

    sorbits committed Nov 4, 2007
    …ittle more permanent)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@8398 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jun 19, 2007
  1. • rewrite first line match pattern to be extended (and thus split int…

    sorbits committed Jun 19, 2007
    …o multiple lines) and add detect of “diff --git”
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7545 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jun 4, 2007
Commits on May 9, 2007
  1. Change in-menu name from Clibpoard to Clipboard.

    infininight committed May 9, 2007
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7183 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on May 5, 2007
  1. • add ‘--strip-trailing-cr’ since the document (which we diff against…

    sorbits committed May 5, 2007
    …) will never have these — if the data diff’ed against uses only CR, then the diff will still fail, but it now works for when it uses CRLF.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@7136 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Apr 5, 2007
  1. • add double-quotes around $TM_SELECTED_FILES

    sorbits committed Apr 5, 2007
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6950 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  2. • use proper Title Case (as defined by Apple, i.e. uppercase ‘From’)

    sorbits committed Apr 5, 2007
    • use rescan_project instead of activating Finder and then TextMate (this prevents Finder windows to go to the front, and rescan_project can easily be made a no-op in 2.0 :) )
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6949 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 21, 2007
  1. Added 'Apply Patch from Clipboard' command to Diff bundle. (Apologies…

    canadaduane committed Mar 21, 2007
    … if I missed a conversation about this... it just seems really useful to me.)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6863 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 4, 2007
  1. Add the following keys to the bundle’s info.plist:

    sorbits committed Mar 4, 2007
    contactName:
       The full name of the contact for this bundle.
    contactEmailRot13:
       A ROT13 encoded email address for the bundle contact (we obfuscate it to avoid spammers from picking up the files, seeing how bundles will often be available via anonymous svn over http).
    description:
       A short description for this bundle. Do link to more info about the language (or whatever) the bundle is about. I decided on using HTML for this (but leave out the initial paragraph tag) since it seemed like overkill to run a single line of text through Markdown.pl, just to convert [foo](link) into <a href="link">foo</a>
    
    Many of the current descriptions could use some improvements, I just wanted to get the ball rolling :)
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6718 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Mar 2, 2007
  1. • provide diff with appropriate labels for the two input sources bein…

    sorbits committed Mar 2, 2007
    …g compared
    
    • change Document With Clipboard to Document / Selection With Clipboard
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6699 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Feb 13, 2007
  1. • give ‘-p0’ as option to patch. This makes it use the full path spec…

    sorbits committed Feb 13, 2007
    …ified in the diff file, rather than just the filename.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6574 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 10, 2006
  1. • exclude the +++/--- lines when calculating statistics (thanks to Gr…

    sorbits committed Nov 10, 2006
    …ant Hollingworth)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@6058 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Sep 9, 2006
  1. • set utf-8 encoding for pbpaste and not diff

    sorbits committed Sep 9, 2006
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@5141 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Sep 3, 2006
Commits on Sep 2, 2006
  1. Adding new punctuation scopes to various rules.

    infininight committed Sep 2, 2006
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@5045 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Aug 10, 2006
  1. Apparently I've had this lying around forever:

    Chris Thomas
    Chris Thomas committed Aug 10, 2006
    [NEW] Diff Document with Arbitrary Fle command.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@4663 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  2. [NEW] Apply Patch to Arbitrary Files command.

    Chris Thomas
    Chris Thomas committed Aug 10, 2006
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@4662 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jul 6, 2006
  1. hi, not sure if some of you remember me .. i did some bundle stuff ab…

    torsten committed Jul 6, 2006
    …out a year ago .. and i am back again. :)
    
    DIFF:
    here is just a minor patch for 'Diff Document With Saved Copy' command, now you can diff a document which has windows line endings (\r\n) against the changes you made.
    
    (it was a bit awkward when i tried to show a friend how great TM is by demonstrating diff and nothing happend. so i had to fix his :D )
    
    RUBY:
    just made the 'Execute Line / Selection as Ruby' thing work with the 10.3 ruby-1.6 (just added parenthesis to the print statement)
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@4024 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jun 3, 2006
  1. • change use of meta.diff.separator to meta.separator

    sorbits committed Jun 3, 2006
    • make an explicit preference for the style of separators in the TextMate bundle (themes can still override this) and change the diff style (previously targeting meta.diff) to target only meta.diff.index
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@3516 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on May 27, 2006
  1. • set encoding (via __CF_USER_TEXT_ENCODING) to utf-8 before calling …

    sorbits committed May 27, 2006
    …opendiff — it still gives a non-ASCII warning, but it does make utf-8 files show correctly
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@3433 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on May 23, 2006
  1. • this overloads the word count (⌃⇧N) for diff files to instead show …

    sorbits committed May 23, 2006
    …number of added and removed lines (when rewriting code, the patch should hopefully not increase the number of lines :) )
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@3398 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Apr 21, 2006
Commits on Feb 7, 2006
  1. • recognize and match diff files produced by Perforce and give the la…

    sorbits committed Feb 7, 2006
    …nguage grammar a key equivalent (patch by Gerd Knops)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2679 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Jan 27, 2006
  1. • fix casing of Diff.pl (as reported by Gerd Knops)

    sorbits committed Jan 27, 2006
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2608 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 22, 2005
  1. • rename

    sorbits committed Nov 22, 2005
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2230 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 21, 2005
  1. • use tool tips for errors

    sorbits committed Nov 21, 2005
    • no longer use temp file for diff'ing selected files
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2218 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 13, 2005
  1. • insert (figure space) padding in the line ranges so that “+nnn,n” b…

    sorbits committed Nov 13, 2005
    …ecomes “+ nnn, n” (and thus align with the line(s) above/below)
    
    This was mainly an exercise in regexp capabilities. It might be nicer to introduce some sort of printf capability to the symbolTransformation syntax, if things like this should be possible (easier).
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2136 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Nov 10, 2005
  1. • markup filename and line numbers as meta.toc-list for inclusion in …

    sorbits committed Nov 10, 2005
    …the symbol popup, this is useful for the Show All Modifications svn command
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2121 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Oct 28, 2005
  1. Renamed to:

    sorbits committed Oct 28, 2005
     • Document With Clipboard
     • Document With Saved Copy
     • Selected Files in Project Drawer
     • Selected Files in Project Drawer (HTML)
     • Merge Selected Files…
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@2025 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
Commits on Oct 17, 2005
  1. • set encoding for $UID instead of 501

    sorbits committed Oct 17, 2005
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1953 dfb7d73b-c2ec-0310-8fea-fb051d288c6d