Permalink
Switch branches/tags
Nothing to show
Commits on Sep 9, 2006
  1. • set utf-8 encoding for pbpaste and not diff

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

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

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

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

    …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
    torsten committed Jul 6, 2006
Commits on Jun 3, 2006
  1. • change use of meta.diff.separator to meta.separator

    • 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
    sorbits committed Jun 3, 2006
Commits on May 27, 2006
  1. • set encoding (via __CF_USER_TEXT_ENCODING) to utf-8 before calling …

    …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
    sorbits committed May 27, 2006
Commits on May 23, 2006
  1. • this overloads the word count (⌃⇧N) for diff files to instead show …

    …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
    sorbits committed May 23, 2006
Commits on Apr 21, 2006
Commits on Feb 7, 2006
  1. • recognize and match diff files produced by Perforce and give the la…

    …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
    sorbits committed Feb 7, 2006
Commits on Jan 27, 2006
  1. • fix casing of Diff.pl (as reported by Gerd Knops)

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

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

    • 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
    sorbits committed Nov 21, 2005
Commits on Nov 13, 2005
  1. • insert (figure space) padding in the line ranges so that “+nnn,n” b…

    …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
    sorbits committed Nov 13, 2005
Commits on Nov 10, 2005
  1. • markup filename and line numbers as meta.toc-list for inclusion in …

    …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
    sorbits committed Nov 10, 2005
Commits on Oct 28, 2005
  1. Renamed to:

     • 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
    sorbits committed Oct 28, 2005
Commits on Oct 17, 2005
  1. • set encoding for $UID instead of 501

    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1953 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Oct 17, 2005
  2. • run diff on the current buffer and clipboard content, which I often…

    … find quite useful :)
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1952 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Oct 17, 2005
Commits on Oct 7, 2005
  1. • more cleanup, error messages, etc.

    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1912 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Oct 7, 2005
  2. • cleanup and use TM_BUNDLE_SUPPORT

    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1911 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Oct 7, 2005
  3. • new command to diff buffer with the version on disk

    • added key equivalent to merge command
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1910 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Oct 7, 2005
Commits on Jul 21, 2005
  1. • added “basic” markup styles as bundle preferences.

    Since the new color & font preferences do not allow a theme to source multiple setting groups (a theme is one color set), shared styles (currently) need to reside in bundles -- this does _not_ mean I want language specific styles in the bundles. These current styles should work with any color set (in that the diff styles set both foreground + background, and the font styles just only change the font style) -- these preferences can be overridden in preferences / fonts & colors (1.1b15).
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1352 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Jul 21, 2005
Commits on Jun 14, 2005
  1. Narrowed the firstLineMatch a touch to avoid a conflict with identify…

    …ing YAML as a diff file.
    
    (Changed '--- ' to '--- [^%]')
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1195 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    infininight committed Jun 14, 2005
Commits on Jun 11, 2005
  1. First set of files updated to latest naming trend.

    Themes haven't been updated to this yet, so you may want to wait doing svn up until everything is updated.
    
    Feel free to make corrections -- most important thing is, things that should be styled equally, should share top-name, things which shouldn't be styled equally, should not share top name. So a language should not have half a dozen keyword sub-groups but instead have storage.*, variable.*, support.*, and keyword.*.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1176 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Jun 11, 2005
Commits on May 27, 2005
  1. • Added \n? to all patterns so that changed background color will ext…

    …end to the right border of the window.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@1091 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed May 27, 2005
Commits on Apr 25, 2005
  1. MIPS:

    • introduced delaration.function-name for labels
    • changed names more to the semantics of the C syntax (keyword.storage, etc)
    • made names more usable for b6 and themes
    
    Graphviz:
    • just changed names to be even more b6 friendly
    
    Diff:
    • also just changes to make it easier styleable
    
    Ruby:
    • added scope: source.ruby to the snippets that didn't had it yet
    • changed the constant.numeric pattern which seemed to be derived from a c style syntax to match what ruby numbers realy could look like (removed type suffixes and added grouping underscores in numbers)
    • changed string.backticked.interpolation.ruby to string.interpolation.ruby and string.backticked.escaped.char.ruby to string.escaped.char.ruby to make it more consistent
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@709 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    torsten committed Apr 25, 2005
Commits on Apr 22, 2005
  1. • generic MIPS cleanup: made names singular and converted the registe…

    …rs.* stuff to variable.register.*
    
    • stripped colors from the RAILS syntax, made it include source.ruby and reset the filetypes to .rb
    
    • generic MODULA cleanup: singular, no colors, made it mostly compatible with the C names
    
    • made GRAPHVIZ ready for b6 (same actions as on the above)
    
    • DIFF now has a firstLineMatch, so it should catch nearly all diff output you pipe on the tm shell tool
    
    • made much more singular in the RUBY syntax, it now again also catches .cgi and .fcgi.
    
    • let RUBY-HTML include source.ruby.rails instead of the ruby mode
    
    
    this all is still work in progress and not finished.
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@663 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    torsten committed Apr 22, 2005
  2. • changed the names of the matches to be better selectable (meta.*)

    • removed colors and other useless stuff
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@654 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    torsten committed Apr 22, 2005
  3. Changed all names to singular form.

    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@649 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Apr 22, 2005
Commits on Apr 21, 2005
  1. Moved all bundles. I'm not sure what happens if you do “svn up” and y…

    …ou have modified stuff inside one of the bundles.
    
    git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@622 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Apr 21, 2005
  2. • Added scopeName key to all languages. Most of them as source.<filen…

    …ame>.
    
    • Added a language for plain text files, currently just markups bullet points (so I can continue these on 'enter' using a scoped snippet).
    • Added a new “firstLineMatch” key to Perl, Ruby, and Shell languages.
    • The C/Objective-C languages use the scopeName in their include directives, this doesn't work for beta 5.
    • Ruby now includes “source.ruby” when using #{ ... } in strings.
    • Added capture names to a few languages (objective-c methods, though it's not very consistant, we'll need to discuss how to split up functions and name the various parts).
    • Removed plist filetype from XML, assuming that people loading a plist into a text editor would generally use the old-style format.
    
    
    
    git-svn-id: http://svn.textmate.org/trunk/Diff.tmbundle@612 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Apr 21, 2005
Commits on Mar 22, 2005
  1. Changed key equivalents to option-ctrl-shift-D since ctrl-shift-D is …

    …now duplicate line. I hope it's okay that these ended with the longer modifier key sequence, since these are probably second to the duplicate line macro.
    
    git-svn-id: http://svn.textmate.org/trunk/Diff.tmbundle@528 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
    sorbits committed Mar 22, 2005