[Monotone-commits-diffs] net.venge.monotone: e8c64454921c1c78f931a98ada0a20e649bd6d85

[code]

revision:            e8c64454921c1c78f931a98ada0a20e649bd6d85
date:                2011-07-19T07:10:39
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of 'b6d5661b17172a52c5083b45cf816d15bfa63d25'
     and 'c041fbff3411992e955063719ca361d849c22eae'

manifest:
format_version "1"

new_manifest [b2025b2bc5ee57322abadaf9e7c05ae254797d1e]

old_revision [b6d5661b17172a52c5083b45cf816d15bfa63d25]

patch "cygport/README.txt"
 from [361e69b992054b76cba996af183076b6a2cd0bce]
   to [7edb410cb14ee2da1875ee18d12c881d0778b7dc]

patch "cygport/monotone.cygwin.patch"
 from [db390a58c5769095af2f36d20dcba1c6609e99da]
   to [e6c67e0555b8a25a94cad440d17a006fdfbb6d88]

patch "doc/monotone.texi"
 from [eab1a08234b86089a4e1105a180425088dfc3992]
   to [b93a39c40870fce709e383709d45003fb638bc0f]

patch "src/cmd_ws_commit.cc"
 from [61d63e20d1beb1f1a02b194c4360cbd57c3c68cc]
   to [aa290a0418e1944d17768dd0d07fe6c3f348f2cf]

old_revision [c041fbff3411992e955063719ca361d849c22eae]

add_file "contrib/mtncommit.vim"
 content [edafe2ebd93351bb290baa1db5b9313dab3237a6]
============================================================
--- doc/monotone.texi	eab1a08234b86089a4e1105a180425088dfc3992
+++ doc/monotone.texi	b93a39c40870fce709e383709d45003fb638bc0f
@@ -7588,7 +7588,7 @@ @section Automation
 
 @end table
 
address@hidden mtn automate get_attributes @var{path}
address@hidden mtn automate get_attributes address@hidden @var{path}
 
 @table @strong
 @item Arguments:
@@ -7610,10 +7610,8 @@ @section Automation
 
 @item Purpose:
 
-Prints all attributes of the given file in the current workspace, and
-the attribute states.
-If a revision is given, then the attributes of the given file at that
-point in time are returned. No workspace is needed in this case.
+Prints all attributes of the given file in the given revision (default
+current workspace revision), and the attribute states.
 
 @item Sample output:
 
============================================================
--- src/cmd_ws_commit.cc	61d63e20d1beb1f1a02b194c4360cbd57c3c68cc
+++ src/cmd_ws_commit.cc	aa290a0418e1944d17768dd0d07fe6c3f348f2cf
@@ -1390,7 +1390,7 @@ CMD_AUTOMATE(get_attributes, N_("PATH"),
 
     if (!from_database)
       {
-        // if if the first value of the value pair is false this marks a
+        // if the first value of the value pair is false this marks a
         // dropped attribute
         if (!i->second.first)
           {
@@ -1447,7 +1447,8 @@ CMD_AUTOMATE(get_attributes, N_("PATH"),
       }
     else
       {
-        // skip previously dropped attributes in database mode
+        // skip previously dropped attributes in database mode, because that
+        // has meaning only in uncommitted workspaces.
         if (!i->second.first)
           continue;
       }
============================================================
--- cygport/README.txt	361e69b992054b76cba996af183076b6a2cd0bce
+++ cygport/README.txt	7edb410cb14ee2da1875ee18d12c881d0778b7dc
@@ -9,8 +9,13 @@
     edit *.cygport and/or *.patch as needed
     add the new version to Port Notes in *.patch
 
-$ cd ../monotone-build_cygwin; make dist-gzip
-$ cp ../monotone-build_cygwin/monotone-$NEW.tar.gz .
+download monotone-$NEW.tar.bz2 from http://www.monotone.ca/downloads.php
+    to monotone/cygport directory
+
+    or build dist-gzip, copy to here
+
+$ bunzip2 monotone-$NEW.tar.bz2
+$ gzip monotone-$NEW.tar
 $ cygport monotone-$NEW-1 all
 $ cp monotone-$NEW-1/spkg/monotone.cygwin.patch .
 
============================================================
--- cygport/monotone.cygwin.patch	db390a58c5769095af2f36d20dcba1c6609e99da
+++ cygport/monotone.cygwin.patch	e6c67e0555b8a25a94cad440d17a006fdfbb6d88
@@ -1,6 +1,6 @@
 --- origsrc/monotone-1.0/CYGWIN-PATCHES/README	1970-01-01 01:00:00.000000000 +0100
 +++ src/monotone-1.0/CYGWIN-PATCHES/README	2010-11-03 20:05:14.793224700 +0100
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,130 @@
 +monotone
 +------------------------------------------
 +monotone is a free distributed version control system. it provides a simple,
@@ -67,6 +67,9 @@
 +
 +Port Notes:
 +
++----------  monotone-1.00-1 -- 2011-04-30 -----------
++Upstream major release. No patch needed.
++
 +----------  monotone-0.99.1-1 -- 2010-11-03 -----------
 +Upstream major release. No patch needed.
 +
============================================================
--- /dev/null	
+++ contrib/mtncommit.vim	edafe2ebd93351bb290baa1db5b9313dab3237a6
@@ -0,0 +1,20 @@
+" Syntax highlighting for monotone commit log messages
+"
+" Set up keywords and patterns we want to highlight
+syn match mtnCommitAdded /\ \ added/
+syn match mtnCommitCancelLine /\*\*\* REMOVE THIS LINE TO CANCEL THE COMMIT \*\*\*/
+" Highlight cert names such as Author: and Branch:
+syn match mtnCommitCertName /^.*: /
+syn match mtnCommitComment /--.*$/
+syn match mtnCommitPatched /\ \ patched/
+syn match mtnCommitRemoved /\ \ removed/
+
+" Set up sane default highlighting links, such as mtnCommitComment->Comment
+hi def link mtnCommitAdded	diffAdded
+hi def link mtnCommitCancelLine	Error
+hi def link mtnCommitCertName	Identifier
+hi def link mtnCommitComment	Comment
+hi def link mtnCommitPatched	diffChanged
+hi def link mtnCommitRemoved	diffRemoved
+
+