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

[code]

revision:            b2729ea31820bf3bca56abb985e92f7009e4d4d2
date:                2011-03-25T09:17:58
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone
changelog:
explicit merge of '45053f844e997bfaa668defab37b5f34717b634a'
              and 'b56f292493f24460669039c877d51be6c28e9971'

manifest:
format_version "1"

new_manifest [34953ccfd697dc4d3283721be7add4d5ad81a65a]

old_revision [45053f844e997bfaa668defab37b5f34717b634a]

rename "cygport/monotone-1.0-1.cygport"
    to "cygport/monotone.cygport"

rename "cygport/monotone-1.0-1.cygwin.patch"
    to "cygport/monotone.cygwin.patch"

patch "INSTALL_windows_cygwin.txt"
 from [1d597eaf91ab262f70b906fdeb2fefa29a06dbcb]
   to [46b16835478139759c0f52b531f16b6731e26314]

patch "Makefile.am"
 from [3b9dd229feb150f3ed03716cfabe1a0b40ff7003]
   to [d8bebdb36192f09f35b5737b9975fce92b11eeb9]

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

patch "doc/Makefile.am"
 from [22cc36ab720cbb36025ad091d1f7445baa756653]
   to [dcc8331723e96245ccf9788fef5c02946580031e]

patch "src/std_hooks.lua"
 from [30949d110cc1ed86d98f4f437fda16778a3e85bb]
   to [ada658bd275399032411e0f520d9900bad966dc4]

old_revision [b56f292493f24460669039c877d51be6c28e9971]

add_dir "test/func/ls_changed_respects_path_masks"

add_file "test/func/ls_changed_respects_path_masks/__driver__.lua"
 content [f6b46f6573d19c035feff9dfa386283b23e406c0]

patch "NEWS"
 from [848a8d23c760b709d5954ef1ca4a812c72404343]
   to [10e25e4e76b43b8ee758a8e3d8c3ed27087af2a3]

patch "src/cmd_list.cc"
 from [e8cdc511a1a5c9f8234bb45628fcb949342cd57f]
   to [5eee1fff3753df893cfc1325d362f6bc8445dd11]
============================================================
--- Makefile.am	3b9dd229feb150f3ed03716cfabe1a0b40ff7003
+++ Makefile.am	d8bebdb36192f09f35b5737b9975fce92b11eeb9
@@ -326,22 +326,11 @@ if WIN32_PLATFORM
   test_bin_check_net_SOURCES = test/src/win32/tester-check-net.cc
   AM_CPPFLAGS += -DWIN32
   LDADD += -lshfolder -lws2_32 -liconv -liphlpapi
-
-  # Msys configure produces c:/ syntax for absolute paths, but Msys
-  # bash requires /c/ syntax. Fix that here. This fails if current
-  # drive is not c, but that just means checktest won't be found, and
-  # the network sync tests not run.
-  fix_abs_builddir := $(subst c:,/c,$(abs_builddir))
-
 else
   src_libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
   mtn_SOURCES += src/unix/main.cc
   test_bin_tester_SOURCES += test/src/unix/tester-plaf.cc
   test_bin_check_net_SOURCES = test/src/unix/tester-check-net.cc
-
-  # Cygwin configure also produces c:/ syntax, but that works for
-  # Cygwin bash
-  fix_abs_builddir := $(abs_builddir)
 endif
 
 if MISSING_INET_PTON
@@ -417,8 +406,8 @@ EXTRA_DIST =								\
 	mac/monotone.pmproj mac/monotone-pkg-logo.gif			\
 									\
 	cygport/README.txt						\
-	cygport/monotone-1.0-1.cygwin.patch				\
-	cygport/monotone-1.0-1.cygport					\
+	cygport/monotone.cygwin.patch					\
+	cygport/monotone.cygport					\
 									\
 	notes/release-checklist.txt					\
 	notes/README.testing notes/tester.txt notes/testsuite.txt	\
@@ -697,7 +686,7 @@ run_%_tests: Makefile
 run_%_tests: Makefile
 	$(AM_V_GEN){ echo '#!/bin/sh';						  	\
 	  echo 'export LANG=C';							  	\
-	  echo 'PATH=$(fix_abs_builddir):$(fix_abs_builddir)/test/bin:$$PATH';	  	\
+	  echo 'PATH=$(abs_builddir):$(abs_builddir)/test/bin:$$PATH';	  		\
 	  echo '$(top_builddir)/test/bin/tester $(srcdir)/test/$*-testsuite.lua "$$@"';	\
 	  echo 'echo $$? > $(top_builddir)/test/$*.status';		  	  	\
 	  echo 'exit 0'; } > $@ && \
============================================================
--- src/std_hooks.lua	30949d110cc1ed86d98f4f437fda16778a3e85bb
+++ src/std_hooks.lua	ada658bd275399032411e0f520d9900bad966dc4
@@ -1523,12 +1523,20 @@ function get_man_page_formatter_command(
    --
    -- On MinGW, 'popen' runs 'cmd.exe' with the inherited path. MinGW
    -- does not (currently) provide nroff or equivalent. So we assume
-   -- sh, nroff and less are also installed, from Cygwin or some other
-   -- toolset.
+   -- sh, nroff, locale and less are also installed, from Cygwin or
+   -- some other toolset.
+   --
+   -- GROFF_ENCODING is an environment variable that, when set, tells
+   -- groff (called by nroff where applicable) to use preconv to convert
+   -- the input from the given encoding to something groff understands.
+   -- For example, groff doesn NOT understand raw UTF-8 as input, but
+   -- it does understand unicode, which preconv will happily provide.
+   -- This doesn't help people that don't use groff, unfortunately.
+   -- Patches are welcome!
    if string.sub(get_ostype(), 1, 7) == "Windows" then
-      return string.format("sh -c 'nroff -man -rLL=%dn' | less -R", term_width)
+      return string.format("sh -c 'GROFF_ENCODING=`locale charmap` nroff -man -rLL=%dn' | less -R", term_width)
    else
-      return string.format("nroff -man -rLL=%dn | less -R", term_width)
+      return string.format("GROFF_ENCODING=`locale charmap` nroff -man -rLL=%dn | less -R", term_width)
    end
 end
 
============================================================
--- INSTALL_windows_cygwin.txt	1d597eaf91ab262f70b906fdeb2fefa29a06dbcb
+++ INSTALL_windows_cygwin.txt	46b16835478139759c0f52b531f16b6731e26314
@@ -36,4 +36,11 @@
 
  export CXXFLAGS="-I/usr/include/boost-1_33_1/ -g -O2"; configure
 
+There is a bug in the bash builtin 'pwd' in bash 4.1; it can return
+'c:/' syntax for absolute paths in some circumstances. See
+http://sourceware.org/ml/cygwin/2002-11/msg01111.html. In particular,
+this happens when starting a bash shell under Emacs, which results in
+configure creating Makefiles with some problems. A work-around is to
+put 'cd `/bin/pwd`' in your ~/.emacs_bash.
+
 See ../cygport/README for building a Cygwin package.
============================================================
--- doc/Makefile.am	22cc36ab720cbb36025ad091d1f7445baa756653
+++ doc/Makefile.am	dcc8331723e96245ccf9788fef5c02946580031e
@@ -35,24 +35,11 @@ EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
 PNG_FIGURES=$(PDF_FIGURES:.pdf=.png)
 EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
 
-# Copied from the main Makefile.am
-if WIN32_PLATFORM
-  # Msys configure produces c:/ syntax for absolute paths, but Msys
-  # bash requires /c/ syntax. Fix that here. This fails if current
-  # drive is not c, but that just means checktest won't be found, and
-  # the network sync tests not run.
-  fix_abs_builddir := $(subst c:,/c,$(abs_builddir))
-else
-  # Cygwin configure also produces c:/ syntax, but that works for
-  # Cygwin bash
-  fix_abs_builddir := $(abs_builddir)
-endif
-
 # See the rules further down that does the work.
-PDF_FIGURES_copied = $(addprefix $(fix_abs_builddir)/,$(PDF_FIGURES))
-PNG_FIGURES_copied = $(addprefix $(fix_abs_builddir)/,$(PNG_FIGURES))
-PNG_IMAGES_copied = $(addprefix $(fix_abs_builddir)/,$(PNG_IMAGES))
-HTML_EXTRA_copied = $(addprefix $(fix_abs_builddir)/,$(HTML_EXTRA))
+PDF_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PDF_FIGURES))
+PNG_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PNG_FIGURES))
+PNG_IMAGES_copied = $(addprefix $(abs_builddir)/,$(PNG_IMAGES))
+HTML_EXTRA_copied = $(addprefix $(abs_builddir)/,$(HTML_EXTRA))
 
 TEXI_FRAGMENTS = pcrepattern.texi pcresyntax.texi
 
@@ -79,19 +66,19 @@ figures/%.ps: figures/%.pdf
 	$(MKDIR_P) figures
 	pdftops $< $@
 
-$(fix_abs_builddir)/figures/%.pdf: figures/%.pdf
+$(abs_builddir)/figures/%.pdf: figures/%.pdf
 	$(MKDIR_P) figures
 	cmp -s $< $@ || cp $< $@
 
-$(fix_abs_builddir)/figures/%.png: figures/%.png
+$(abs_builddir)/figures/%.png: figures/%.png
 	$(MKDIR_P) figures
 	cmp -s $< $@ || cp $< $@
 
-$(fix_abs_builddir)/images/%.png: images/%.png
+$(abs_builddir)/images/%.png: images/%.png
 	$(MKDIR_P) images
 	cmp -s $< $@ || cp $< $@
 
-$(fix_abs_builddir)/texinfo.css: texinfo.css
+$(abs_builddir)/texinfo.css: texinfo.css
 	cmp -s $< $@ || cp $< $@
 
 # Stealing code from automake and adapting, we want a HTML file tree as well
============================================================
--- cygport/README.txt	ad5a3fd13d3200b9acb48cfe64c137ab14396f69
+++ cygport/README.txt	361e69b992054b76cba996af183076b6a2cd0bce
@@ -3,8 +3,8 @@
 We use the cygport Cygwin package.
 
 $ cd monotone/cygport
-$ mtn mv monotone-$OLD-1.cygport monotone-$NEW-1.cygport
-$ mtn mv monotone-$OLD-1.cygwin.patch monotone-$NEW-1.cygwin.patch
+$ ln -s monotone.cygport monotone-$NEW-1.cygport
+$ ln -s monotone.cygwin.patch monotone-$NEW-1.cygwin.patch
 
     edit *.cygport and/or *.patch as needed
     add the new version to Port Notes in *.patch
@@ -12,6 +12,7 @@
 $ cd ../monotone-build_cygwin; make dist-gzip
 $ cp ../monotone-build_cygwin/monotone-$NEW.tar.gz .
 $ cygport monotone-$NEW-1 all
+$ cp monotone-$NEW-1/spkg/monotone.cygwin.patch .
 
 If cygport hangs, it may be due to a parallel make bug. Try the
 following:
============================================================
--- NEWS	848a8d23c760b709d5954ef1ca4a812c72404343
+++ NEWS	10e25e4e76b43b8ee758a8e3d8c3ed27087af2a3
@@ -118,6 +118,9 @@ XXX XXX XX XX:XX:XX UTC 2011
           or partial identifier contains non-hex digits.
           (fixes monotone issue 143)
 
+        - Performance of "mtn ls changed" has been improved and is now
+          comparable to "mtn status". (fixes monotone issue 120)
+
         Internal
 
         - The source tree has been reorganized. Sources, tests and documentation
============================================================
--- src/cmd_list.cc	e8cdc511a1a5c9f8234bb45628fcb949342cd57f
+++ src/cmd_list.cc	5eee1fff3753df893cfc1325d362f6bc8445dd11
@@ -860,7 +860,6 @@ CMD(changed, "changed", "", CMD_REF(list
   roster_t new_roster;
   temp_node_id_source nis;
   work.get_current_roster_shape(db, nis, new_roster);
-  work.update_current_roster_from_filesystem(new_roster);
 
   work.get_parent_rosters(db, parents);
 
@@ -869,6 +868,7 @@ CMD(changed, "changed", "", CMD_REF(list
                         app.opts.depth,
                         parents, new_roster, ignored_file(work));
 
+  work.update_current_roster_from_filesystem(new_roster, mask);
   revision_t rrev;
   make_restricted_revision(parents, new_roster, mask, rrev);
 
============================================================
--- /dev/null	
+++ test/func/ls_changed_respects_path_masks/__driver__.lua	f6b46f6573d19c035feff9dfa386283b23e406c0
@@ -0,0 +1,25 @@
+
+-- remove "x/a.txt" - so it becomes missing
+-- then "mtn ls changed y"
+-- we should get no output - as there are no changes in "y"
+
+mtn_setup()
+
+mkdir("x")
+mkdir("y")
+
+writefile("x/a.txt", "a")
+writefile("x/b.txt", "b")
+writefile("y/a.txt", "a")
+writefile("y/b.txt", "b")
+
+check(mtn("add", "x/a.txt"), 0, false, false)
+check(mtn("add", "x/b.txt"), 0, false, false)
+check(mtn("add", "y/a.txt"), 0, false, false)
+check(mtn("add", "y/b.txt"), 0, false, false)
+
+commit()
+
+remove("x/a.txt")
+
+check(mtn("ls", "changed", "y"), 0, nil, false)