From 1af0bb64b499e9e0a02043a8cb405caf58e03961 Mon Sep 17 00:00:00 2001
From: michener <michener@23f722f6-122a-0410-8cef-c75bd312dd78>
Date: Thu, 5 May 2011 19:28:34 +0000
Subject: [PATCH] Update ptw

git-svn-id: http://photonzero.com/dotfiles/trunk@98 23f722f6-122a-0410-8cef-c75bd312dd78
---
 bin/git-ptw | 3 ++-
 bin/ptw     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/git-ptw b/bin/git-ptw
index c8187a3..f5ca1ba 100755
--- a/bin/git-ptw
+++ b/bin/git-ptw
@@ -1,2 +1,3 @@
 #!/bin/bash
-git log --format="%at%x09%s" --author="barakmich" | ptw import --client="git" --source="Git Log"
+git log --no-merges --format="%at%x09%s" --shortstat --author="barakmich" | sed "N;s/\n//;N;s/\n/ - /" |  sed 's/files changed,/c;/g' | sed 's/insertions(+),/(+);/g' | sed 's/deletions(-)/(-)/g' | ptw import --client="git" --source="Git Log" 
+#git log --format="%at%x09%s" --author="barakmich" | ptw import --client="git" --source="Git Log"
diff --git a/bin/ptw b/bin/ptw
index 08455bd..2cd2cc2 100755
--- a/bin/ptw
+++ b/bin/ptw
@@ -196,7 +196,7 @@ def db_get(count=None, since=None):
 def timestamp_and_text_exists(timestamp, text, db):
   for x in db:
     if x["timestamp"] == timestamp:
-      if x["text"] == text:
+      if text.startswith(x["text"]):
         return True
   return False