# HG changeset patch
# User jrice@netbeans.org
# Date 1201813088 0
# Node ID 218c59de124d311489e3ed722cbdc6b6014cef7e
# Parent  ecfba7186f3d53aa6e1da103cf42119f7660b998
#121593: Mercurial Search History - show CSet Short ID as well as revision and set From & To with todays date to allow easy initial but limited search.

diff -r ecfba7186f3d -r 218c59de124d mercurial/src/org/netbeans/modules/mercurial/ui/log/HgLogMessage.java
--- a/mercurial/src/org/netbeans/modules/mercurial/ui/log/HgLogMessage.java	Thu Jan 31 09:44:14 2008 -0800
+++ b/mercurial/src/org/netbeans/modules/mercurial/ui/log/HgLogMessage.java	Thu Jan 31 20:58:08 2008 +0000
@@ -142,6 +142,9 @@ public class HgLogMessage {
     public String getAuthor() {
         return author;
     }
+    public String getCSetShortID() {
+        return id;
+    }
     public String getMessage() {
         return desc;
     }
diff -r ecfba7186f3d -r 218c59de124d mercurial/src/org/netbeans/modules/mercurial/ui/log/SearchCriteriaPanel.java
--- a/mercurial/src/org/netbeans/modules/mercurial/ui/log/SearchCriteriaPanel.java	Thu Jan 31 09:44:14 2008 -0800
+++ b/mercurial/src/org/netbeans/modules/mercurial/ui/log/SearchCriteriaPanel.java	Thu Jan 31 20:58:08 2008 +0000
@@ -45,6 +45,7 @@ import java.io.File;
 import java.io.File;
 import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -62,12 +63,20 @@ class SearchCriteriaPanel extends javax.
         this.roots = roots;
         this.url = null;
         initComponents();
+
+        String todaysDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); // NOI18N
+        tfFrom.setText(todaysDate);
+        tfTo.setText(todaysDate);
     }
 
     public SearchCriteriaPanel(String url) {
         this.url = url;
         this.roots = null;
         initComponents();
+
+        String todaysDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()); // NOI18N
+        tfFrom.setText(todaysDate);
+        tfTo.setText(todaysDate);
     }
     
     public String getFrom() {
diff -r ecfba7186f3d -r 218c59de124d mercurial/src/org/netbeans/modules/mercurial/ui/log/SummaryView.java
--- a/mercurial/src/org/netbeans/modules/mercurial/ui/log/SummaryView.java	Thu Jan 31 09:44:14 2008 -0800
+++ b/mercurial/src/org/netbeans/modules/mercurial/ui/log/SummaryView.java	Thu Jan 31 20:58:08 2008 +0000
@@ -607,7 +607,8 @@ class SummaryView implements MouseListen
                 sd.remove(0, sd.getLength());
                 sd.setParagraphAttributes(0, sd.getLength(), noindentStyle, false);
 
-                sd.insertString(0, container.getLog().getRevision(), null);
+                sd.insertString(0, container.getLog().getRevision() + 
+                        " (" + container.getLog().getCSetShortID() + ")", null); // NOI18N
                 sd.setCharacterAttributes(0, sd.getLength(), filenameStyle, false);
                 sd.insertString(sd.getLength(), FIELDS_SEPARATOR + container.getLog().getAuthor(), null);                
                 sd.insertString(sd.getLength(), FIELDS_SEPARATOR + defaultFormat.format(container.getLog().getDate()), null);