##// END OF EJS Templates
Merge with stable
Martin Geisler -
r10257:a9c0d606 merge default
parent child Browse files
Show More
@@ -19,6 +19,9 b' BuildRoot: %{_tmppath}/%{name}-%{version'
19 #
19 #
20 BuildRequires: python >= 2.4, python-devel, make, gcc, docutils >= 0.5
20 BuildRequires: python >= 2.4, python-devel, make, gcc, docutils >= 0.5
21 Provides: hg = %{version}-%{release}
21 Provides: hg = %{version}-%{release}
22 Requires: python >= 2.4
23 # The hgk extension uses the wish tcl interpreter, but we don't enforce it
24 #Requires: tk
22
25
23 %define pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))')
26 %define pythonver %(python -c 'import sys;print ".".join(map(str, sys.version_info[:2]))')
24 %define emacs_lispdir %{_datadir}/emacs/site-lisp
27 %define emacs_lispdir %{_datadir}/emacs/site-lisp
@@ -41,7 +44,8 b' make install-doc DESTDIR=$RPM_BUILD_ROOT'
41 install contrib/hgk $RPM_BUILD_ROOT%{_bindir}
44 install contrib/hgk $RPM_BUILD_ROOT%{_bindir}
42 install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
45 install contrib/convert-repo $RPM_BUILD_ROOT%{_bindir}/mercurial-convert-repo
43 install contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}
46 install contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}
44 install contrib/git-viz/{hg-viz,git-rev-tree} $RPM_BUILD_ROOT%{_bindir}
47 install contrib/git-viz/hg-viz $RPM_BUILD_ROOT%{_bindir}
48 install contrib/git-viz/git-rev-tree $RPM_BUILD_ROOT%{_bindir}
45
49
46 bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
50 bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
47 mkdir -p $bash_completion_dir
51 mkdir -p $bash_completion_dir
@@ -53,6 +57,7 b' install -m 644 contrib/zsh_completion $z'
53
57
54 mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
58 mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
55 install contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}
59 install contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}
60 install contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}
56
61
57 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
62 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
58 install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
63 install contrib/mergetools.hgrc $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
@@ -63,11 +68,12 b' rm -rf $RPM_BUILD_ROOT'
63 %files
68 %files
64 %defattr(-,root,root,-)
69 %defattr(-,root,root,-)
65 %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
70 %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html doc/ja *.cgi contrib/*.fcgi
66 %doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
71 %doc %attr(644,root,root) %{_mandir}/man?/hg*
67 %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
72 %doc %attr(644,root,root) contrib/*.svg contrib/sample.hgrc
68 %{_sysconfdir}/bash_completion.d/mercurial.sh
73 %{_sysconfdir}/bash_completion.d/mercurial.sh
69 %{_datadir}/zsh/site-functions/_mercurial
74 %{_datadir}/zsh/site-functions/_mercurial
70 %{_datadir}/emacs/site-lisp/mercurial.el
75 %{_datadir}/emacs/site-lisp/mercurial.el
76 %{_datadir}/emacs/site-lisp/mq.el
71 %{_bindir}/hg
77 %{_bindir}/hg
72 %{_bindir}/hgk
78 %{_bindir}/hgk
73 %{_bindir}/hg-ssh
79 %{_bindir}/hg-ssh
@@ -14,8 +14,15 b' def share(ui, source, dest=None, noupdat'
14 Initialize a new repository and working directory that shares its
14 Initialize a new repository and working directory that shares its
15 history with another repository.
15 history with another repository.
16
16
17 NOTE: actions that change history such as rollback or moving the
17 NOTE: using rollback or extensions that destroy/modify history
18 source may confuse sharers.
18 (mq, rebase, etc.) can cause considerable confusion with shared
19 clones. In particular, if two shared clones are both updated to
20 the same changeset, and one of them destroys that changeset with
21 rollback, the other clone will suddenly stop working: all
22 operations will fail with "abort: working directory has unknown
23 parent". The only known workaround is to use debugsetparents on
24 the broken clone to reset it to a changeset that still exists
25 (e.g. tip).
19 """
26 """
20
27
21 return hg.share(ui, source, dest, not noupdate)
28 return hg.share(ui, source, dest, not noupdate)
@@ -119,7 +119,7 b' cd ..'
119 hg init eucjp
119 hg init eucjp
120 cd eucjp
120 cd eucjp
121
121
122 printf '\265\376\n' >> eucjp.txt # Japanese kanji "Kyo"
122 python -c 'print("\265\376")' >> eucjp.txt # Japanese kanji "Kyo"
123
123
124 hg ci -Ama
124 hg ci -Ama
125
125
@@ -176,7 +176,7 b" hg email --date '1980-1-1 0:1' -m tmp.mb"
176 cat tmp.mbox | fixheaders
176 cat tmp.mbox | fixheaders
177
177
178 echo "% test multi-byte domain parsing"
178 echo "% test multi-byte domain parsing"
179 UUML=`printf '\374'`
179 UUML=`python -c 'import sys; sys.stdout.write("\374")'`
180 HGENCODING=iso-8859-1
180 HGENCODING=iso-8859-1
181 export HGENCODING
181 export HGENCODING
182 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \
182 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \
General Comments 0
You need to be logged in to leave comments. Login now