[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-commits ] [ GitPlugin plugin ] GitPlugin jEdit plugin branch master updated. e1db94b86c4274c
From: "Alan Ezust" <ezust () users ! sourceforge ! net>
Date: 2013-08-30 6:10:05
Message-ID: E1VFHuP-0003Bp-PI () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GitPlugin jEdit plugin".
The branch, master has been updated
via e1db94b86c4274c519fa3fb0d4d2d80f3f31689e (commit)
from 90d93629f387eabb3bb038c9154a5aebebe0c28d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/GitPlugin;a=commit;h=e1db94b86c4274c519fa3fb0d4d2d80f3f31689e
commitdiff: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/GitPlugin;a=commitdiff;h=e1db94b86c4274c519fa3fb0d4d2d80f3f31689e
tree: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/GitPlugin;a=tree;h=e1db94b86c4274c519fa3fb0d4d2d80f3f31689e;hb=e1db94b86c4274c519fa3fb0d4d2d80f3f31689e
commit e1db94b86c4274c519fa3fb0d4d2d80f3f31689e
Author: Alan Ezust <ezust@users.sourceforge.net>
Date: Thu Aug 29 23:09:54 2013 -0700
short date format.
change author.
diff --git a/git/command/Blame.java b/git/command/Blame.java
index 15e33f7..0b16fd1 100644
--- a/git/command/Blame.java
+++ b/git/command/Blame.java
@@ -44,7 +44,6 @@ import org.gjt.sp.util.StringList;
public class Blame extends GitCommand implements LineVisitor
{
//{{{ Data Members
-
JEditTextArea textArea;
Buffer buffer;
StringList blameLines;
@@ -54,20 +53,16 @@ public class Blame extends GitCommand implements LineVisitor
String summary;
Date committerTime;
- Pattern hashLine;
- Pattern committerLine;
- Pattern committerTimeLine;
- Pattern summaryLine;
+ static final Pattern hashLine = Pattern.compile("(\\w{40}) \\d+ (\\d+)");
+ static final Pattern committerLine = Pattern.compile("committer (.+)");
+ static final Pattern committerTimeLine = Pattern.compile("committer-time (\\d+)");
+ static final Pattern summaryLine = Pattern.compile("summary (.*)");
//}}}
//{{{ Constructor
public Blame (JEditTextArea ta, Buffer b)
{
super(MiscUtilities.getParentOfPath(b.getPath()),
- "blame", "--line-porcelain", b.getName());
- hashLine = Pattern.compile("(\\w{40}) \\d+ (\\d+)");
- committerLine = Pattern.compile("committer (.+)");
- committerTimeLine = Pattern.compile("committer-time (\\d+)");
- summaryLine = Pattern.compile("summary (.*)");
+ "blame", "--line-porcelain", b.getName());
textArea = ta;
buffer = b;
blameLines = new StringList();
@@ -101,7 +96,7 @@ public class Blame extends GitCommand implements LineVisitor
return true;
}
if (line.startsWith("filename")) {
- DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
String blameLine = df.format(committerTime) + " " + committer;
blameLines.add(blameLine);
String hover = "<html><body><p>" + currentHash + "<br/>"
diff --git a/index.html b/index.html
index 6148de0..344a962 100644
--- a/index.html
+++ b/index.html
@@ -189,7 +189,7 @@ commenting on tickets. </p>
width="100%">
<tr align="CENTER" width="100%">
<td bgcolor="#7FB2FF" width="100%"><strong><font color="#FFFFFF" size="+1">
- <a name="history">History</a></font></strong></td>
+ <a name="history">Version History</a></font></strong></td>
</tr>
</table>
-----------------------------------------------------------------------
Summary of changes:
git/command/Blame.java | 17 ++++++-----------
index.html | 2 +-
2 files changed, 7 insertions(+), 12 deletions(-)
hooks/post-receive
--
GitPlugin jEdit plugin
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic