# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1263606000 -3600
# Node ID a9c0d6060827edf92106ed00430e96d524fc2d8d
# Parent  8d5de52431f27d2ccb0679a7980e365a5ef4eca8# Parent  279c8a73fde10f73078432a06b2cf3b7a774fff6
Merge with stable

diff -r 8d5de52431f2 -r a9c0d6060827 contrib/mercurial.spec
--- a/contrib/mercurial.spec	Sat Jan 16 02:33:06 2010 +0100
+++ b/contrib/mercurial.spec	Sat Jan 16 02:40:00 2010 +0100
@@ -19,6 +19,9 @@
 #
 BuildRequires: python >= 2.4, python-devel, make, gcc, docutils >= 0.5
 Provides: hg = %{version}-%{release}
+Requires: python >= 2.4
+# The hgk extension uses the wish tcl interpreter, but we don't enforce it
+#Requires: tk
 
 %define pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))')
 %define emacs_lispdir %{_datadir}/emacs/site-lisp
@@ -41,7 +44,8 @@
 install contrib/hgk          $RPM_BUILD_ROOT%{_bindir}
 install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
 install contrib/hg-ssh       $RPM_BUILD_ROOT%{_bindir}
-install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
+install contrib/git-viz/hg-viz $RPM_BUILD_ROOT%{_bindir}
+install contrib/git-viz/git-rev-tree $RPM_BUILD_ROOT%{_bindir}
 
 bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 mkdir -p $bash_completion_dir
@@ -53,6 +57,7 @@
 
 mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
 install contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}
+install contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
@@ -63,11 +68,12 @@
 %files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
-%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
+%doc %attr(644,root,root) %{_mandir}/man?/hg*
 %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
 %{_sysconfdir}/bash_completion.d/mercurial.sh
 %{_datadir}/zsh/site-functions/_mercurial
 %{_datadir}/emacs/site-lisp/mercurial.el
+%{_datadir}/emacs/site-lisp/mq.el
 %{_bindir}/hg
 %{_bindir}/hgk
 %{_bindir}/hg-ssh
diff -r 8d5de52431f2 -r a9c0d6060827 hgext/share.py
--- a/hgext/share.py	Sat Jan 16 02:33:06 2010 +0100
+++ b/hgext/share.py	Sat Jan 16 02:40:00 2010 +0100
@@ -14,8 +14,15 @@
     Initialize a new repository and working directory that shares its
     history with another repository.
 
-    NOTE: actions that change history such as rollback or moving the
-    source may confuse sharers.
+    NOTE: using rollback or extensions that destroy/modify history
+    (mq, rebase, etc.) can cause considerable confusion with shared
+    clones. In particular, if two shared clones are both updated to
+    the same changeset, and one of them destroys that changeset with
+    rollback, the other clone will suddenly stop working: all
+    operations will fail with "abort: working directory has unknown
+    parent". The only known workaround is to use debugsetparents on
+    the broken clone to reset it to a changeset that still exists
+    (e.g. tip).
     """
 
     return hg.share(ui, source, dest, not noupdate)
diff -r 8d5de52431f2 -r a9c0d6060827 tests/test-highlight
--- a/tests/test-highlight	Sat Jan 16 02:33:06 2010 +0100
+++ b/tests/test-highlight	Sat Jan 16 02:40:00 2010 +0100
@@ -119,7 +119,7 @@
 hg init eucjp
 cd eucjp
 
-printf '\265\376\n' >> eucjp.txt  # Japanese kanji "Kyo"
+python -c 'print("\265\376")' >> eucjp.txt  # Japanese kanji "Kyo"
 
 hg ci -Ama
 
diff -r 8d5de52431f2 -r a9c0d6060827 tests/test-patchbomb
--- a/tests/test-patchbomb	Sat Jan 16 02:33:06 2010 +0100
+++ b/tests/test-patchbomb	Sat Jan 16 02:40:00 2010 +0100
@@ -176,7 +176,7 @@
 cat tmp.mbox | fixheaders
 
 echo "% test multi-byte domain parsing"
-UUML=`printf '\374'`
+UUML=`python -c 'import sys; sys.stdout.write("\374")'`
 HGENCODING=iso-8859-1
 export HGENCODING
 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \