Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 22:32:17 +0100] rev 9819
convert: reenable SVN support after license issue solved
Patrick Mezard <pmezard@gmail.com> [Sun, 08 Nov 2009 18:08:24 +0100] rev 9818
patchbomb: normalize date format in generated mboxes
mbox format should use time.asctime(). Unfortunately, this function writes
2-characters day of week on Windows while unix one writes a single character.
Normalize to Windows version since the other one can hardly be written with
strftime().
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 11:57:03 +0100] rev 9817
hghave: be more tolerant to rst2html output
On Windows, rst2html.bat calls rst2html.py, printing something like:
"rst2html.py (Docutils"
(notice the extra ".py")
Patrick Mezard <pmezard@gmail.com> [Tue, 10 Nov 2009 21:55:59 +0100] rev 9816
test-convert-hg-svn: fix test output
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 20:15:49 +0100] rev 9815
rebase: make sure the newancestor is used during the whole update
(issue1561)
Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).
Added a new test case for this: test-rebase-newancestor.
Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 10:06:08 +0100] rev 9814
buildrpm: enhance changelog of the RPM file
Now the changelog is different depending if the parent is tagged:
- for tags, keep the previous content, i.e. changelog of the tags.
- for nightly build, changelog of the changesets since the latest tag
As RPM is expecting strictly descending dates, I have used a python
script to reorder the mercurial changelog.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:59:55 +0100] rev 9813
buildrpm: build full RPM package including sources
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:53:23 +0100] rev 9812
buildrpm: cleanup script
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:35:38 +0100] rev 9811
buildrpm: enable to start the script from anywhere
Previously the script worked only from the hg root.
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:30:18 +0100] rev 9810
buildrpm: warn if there is outstanding uncommitted changes
Gilles Moris <gilles.moris@free.fr> [Fri, 06 Nov 2009 09:26:29 +0100] rev 9809
buildrpm: build from working dir parent and use hg version for RPM versioning
Previous, RPMs was always built from tip, and the release number did not match
the 'hg version' put in place for 1.4.
This will enable also to this script to be able to build official tag and not
only nightly build.
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 23:47:24 +0100] rev 9808
doc: fix language in CSS comments (by timeless)
Christian Boos <cboos@bct-technology.com> [Mon, 09 Nov 2009 17:33:16 +0100] rev 9807
setup: fix f51d1822d6fd refactoring, propagate env to runcmd
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 09 Nov 2009 17:28:40 -0200] rev 9806
clone: simplify help text
Martin Geisler <mg@lazybytes.net> [Mon, 09 Nov 2009 20:43:06 +0100] rev 9805
Merge with main
Dongsheng Song <dongsheng.song@gmail.com> [Mon, 09 Nov 2009 20:39:58 +0100] rev 9804
i18n-zh: updated Chinese translation
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:41:54 +0100] rev 9803
i18n-da: synchronized with 6cb1808e5ae7
Mads Kiilerich <mads@kiilerich.com> [Sun, 08 Nov 2009 18:50:39 +0100] rev 9802
test-extension: Solaris grep don't know [[:digit:]]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:18:46 +0100] rev 9801
merge with hg-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 18:05:56 +0100] rev 9800
fix test-patchbomb on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 08 Nov 2009 17:59:36 +0100] rev 9799
fix test-diffstat on solaris
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 17:27:01 +0100] rev 9798
doc: uppercase first letter in HTML man pages
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:40:51 -0600] rev 9797
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:09:28 +0100] rev 9796
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 08 Nov 2009 17:03:24 +0100] rev 9795
merge with stable
Yuya Nishihara <yuya@tcha.org> [Mon, 09 Nov 2009 00:00:47 +0900] rev 9794
doc: styles for man page, which suit with the mercurial website
designed loosely based on:
http://mercurial.selenic.com/css/styles.css
with some modifications by intention:
* visited links are colored differently
* no fixed size
* works without typeface.js
we keep most styles, which is from docutils, untouched.
tested with:
* MSIE 6.0 on Windows
* Firefox 3.5 on Linux
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 16:16:21 +0100] rev 9793
rst2man: more robust uppercasing of section titles
This handles section titles with child elements such as emphasis or
inline literals.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:46:38 +0100] rev 9792
doc: use titlecase in man page section titles
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 11:41:34 +0100] rev 9791
rst2man: automatically write sections in uppercase
Man pages have uppercased section titles but other formats do not.
Letting rst2man handle the tranformation allows better reuse of text
between man pages and other formats.
Martin Geisler <mg@lazybytes.net> [Sun, 08 Nov 2009 00:11:34 +0100] rev 9790
relink: do not translate format string with no text
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:38:01 +0100] rev 9789
Use utf-8 encoding in test-branchmap's clone call
After 75520c24feda it is printed in local encoding, i.e. "C" if not set
otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:35:46 +0100] rev 9788
Branch name printed since a3d73b3e1f8a now in local encoding.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 07 Nov 2009 23:27:25 +0100] rev 9787
Make test-branchmap executable and adjust output after a3d73b3e1f8a
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:13:09 +0100] rev 9786
ui: refer to "hg help config" when no username is set
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 22:12:50 +0100] rev 9785
help: add "hg help config" topic
This is a condensed version of the first two sections of hgrc.5.txt.
After a slight upgrade of minirst, we can move the whole of hgrc.5.txt
into the config help topic and just let the man page include it.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 18:47:04 +0100] rev 9784
hgrc.5: do not mention "name: value" syntax
This was supported in versions prior to 1.3 where we used the standard
Python ConfigParser. The new config parser never supported it.
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:29:52 -0600] rev 9783
submerge: properly deal with overwrites
also pull .hgsubstate check out of inner loop
Matt Mackall <mpm@selenic.com> [Sun, 08 Nov 2009 10:24:18 -0600] rev 9782
subrepo: add more debugging output, lose _ markers
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:31:43 -0600] rev 9781
subrepo: do a linear update when appropriate
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:30:42 -0600] rev 9780
subrepo: notice dirty subrepo states when merging
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 16:29:49 -0600] rev 9779
subrepo: add some debug output to submerge
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:13:15 -0600] rev 9778
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 04 Nov 2009 22:14:26 +0100] rev 9777
i18n-sv: add missing newlines to translations
Jens Bäckman <jens.backman@gmail.com> [Wed, 04 Nov 2009 21:59:41 +0100] rev 9776
i18n-sv: simple translation fixes
Fixed the fuzzy translations. Also took care of a few really simple strings,
and translated the 'summary' command.
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 02 Nov 2009 17:25:43 +0200] rev 9775
i18n-de: Update msgids, remove .txt linespecs + few small translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 28 Oct 2009 18:53:12 -0200] rev 9774
i18n-pt_BR: synchronized with d942e06d7b14
Martin Geisler <mg@lazybytes.net> [Wed, 28 Oct 2009 20:48:24 +0100] rev 9773
Merge with main
Martin Geisler <mg@lazybytes.net> [Mon, 26 Oct 2009 20:58:49 +0100] rev 9772
i18n-da: synchronized with e06c940d554d plus some new translations
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 26 Oct 2009 12:32:14 -0200] rev 9771
i18n-pt_BR: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:50:30 +0100] rev 9770
i18n-zh_TW: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:50:12 +0100] rev 9769
i18n-zh_CN: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:49:25 +0100] rev 9768
i18n-sv: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:47:48 +0100] rev 9767
i18n-ja: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:46:23 +0100] rev 9766
i18n-it: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:44:57 +0100] rev 9765
i18n-fr: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sun, 25 Oct 2009 12:44:22 +0100] rev 9764
i18n-el: synchronized with e06c940d554d
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:47:49 +0200] rev 9763
Merge with main
Martin Geisler <mg@lazybytes.net> [Sat, 24 Oct 2009 00:44:57 +0200] rev 9762
i18n-da: synchronized
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 15:26:22 -0200] rev 9761
i18n-pt_BR: translate 'changeset' like 'revision'
On Mercurial, 'changeset' and 'revision' may be used
interchangeably, but the first is more or less
untranslatable to a single word.
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:24:56 +0200] rev 9760
i18n: merge de and pt_BR translations
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:11:21 +0200] rev 9759
i18n-de: fixed inline emphasis
The test-gendoc test said:
gendoc-de.txt:1385: (WARNING/2) Inline emphasis start-string without
end-string
Martin Geisler <mg@lazybytes.net> [Tue, 20 Oct 2009 18:23:33 +0200] rev 9758
i18n-pt_BR: fixed bullet list
The test-gendoc test said:
gendoc-pt_BR.txt:1475: (WARNING/2) Bullet list ends without a blank
line; unexpected unindent.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 13:09:47 -0200] rev 9757
i18n-pt_BR: synchronized with fc493cb90bb1
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 20 Oct 2009 13:07:26 -0200] rev 9756
i18n-pt_BR: synchronized with 5287de171d74
Fabian Kreutz <fabian.kreutz@starnet.fi> [Tue, 20 Oct 2009 17:31:09 +0300] rev 9755
i18n-de: Removed all fuzzies and translated small alphaend-extensions
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 28 Sep 2009 20:32:54 -0300] rev 9754
i18n-pt_BR: synchronized with 02c43e8e0835
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:12:08 -0600] rev 9753
Fix up import test
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:09:16 -0600] rev 9752
subrepo: more robust split for .hgsubstate parsing
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:07:45 -0600] rev 9751
filectx: shortcut unrelated files in ancestor() (issue1327)
Matt Mackall <mpm@selenic.com> [Sat, 07 Nov 2009 14:07:45 -0600] rev 9750
merge: first part of fix for issue1327
When there are no renames involved, we shortcut to the changeset
ancestor. This resolves most cases.
Note that Mercurial's rename philosophy elsewhere is that a file's
name is signficant and rename data is only consulted when a file of
the same name is absent.
Jesse Glick <jesse.glick@sun.com> [Thu, 05 Nov 2009 16:40:48 -0500] rev 9749
Related to Issue919: ui.progress, apparently unused before now, is busted.
Jesse Glick <jesse.glick@sun.com> [Sat, 17 Oct 2009 14:00:41 -0400] rev 9748
Sometimes pushing to an HTTP repo fails with a useless message.
abort: 'https://.../.../' does not appear to be an hg repository!
Ought to produce a better diagnostics on the client. With patched 1.3.1,
observed to produce an Apache HTML error message (from cgitb) including the
vital text:
File ".../hgwebdir.cgi", line 70, in ?
wsgicgi.launch(application)
File "mercurial/hgweb/wsgicgi.py", line 68, in launch
File "mercurial/hgweb/hgwebdir_mod.py", line 91, in __call__
File "mercurial/hgweb/hgwebdir_mod.py", line 148, in run_wsgi
File "mercurial/hgweb/hgweb_mod.py", line 100, in run_wsgi
File "mercurial/hgweb/protocol.py", line 156, in unbundle
File "mercurial/localrepo.py", line 2031, in addchangegroup
File "mercurial/revlog.py", line 1204, in addgroup
LookupError: 00manifest.i@......: unknown parent
Might also be helpful if server's hgweb_mod.run_wsgi caught unexpected errors
and returned a well-formed error response including the stack trace. The client
patch would still be useful in this case, because it would let you diagnose
issues with HTTP proxy servers and so on.
timeless@mozdev.org [Mon, 26 Oct 2009 02:06:23 +0200] rev 9747
hg help resolve grossly mischaracterizes the --all switch
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 15:51:32 +0100] rev 9746
hgrc.5: mark more inline literals
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 14:41:03 +0100] rev 9745
hgrc.5: do not turn random URLs into links
URLs and email addresses are automatically turned into links. We don't
want that when talking about example links and addresses.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 14:30:58 +0100] rev 9744
hgrc.5: use enumerated list for email charsets
Christian Ebert <blacktrash@gmx.net> [Sat, 07 Nov 2009 13:54:47 +0100] rev 9743
hgrc.5: order of email charsets is not a top level literal block
- it belongs under email charsets, not email in general
- enumerate order
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 07 Nov 2009 13:25:25 +0100] rev 9742
sshrepo: move mkstemp() out of the try block, we don't use the exception
simpler fix for 3b6f18851d87
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:22:03 +0100] rev 9741
minirst: update module docstring
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:16:23 +0100] rev 9740
commands: use enumerated lists in help texts
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:14:56 +0100] rev 9739
minirst: support enumerated lists
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 03:04:46 +0100] rev 9738
minirst: prepare for general types of bullet lists
The old code worked for '-' bullets only, but we can easily support
variable width bullets.
Martin Geisler <mg@lazybytes.net> [Fri, 06 Nov 2009 00:30:35 +0100] rev 9737
minirst: combine list parsing in one function
Bullet, option, field, and definition lists were parsed very similar
code. They are now parsed by a single function (splitparagraphs).
Some logic from the old parsing functions has been moved down to
formatblock. This simplifies the parsing while putting the logic where
it's really needed.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 21:53:22 +0100] rev 9736
test-minirst: don't test on invalid reST input
Input such as
Only the
left-most line
(this line!)
is significant
for the indentation
is not valid reStructuredText: the first line starts a block quote,
but then the second line is not allowed to be unindented.
Martin Geisler <mg@lazybytes.net> [Thu, 05 Nov 2009 21:30:50 +0100] rev 9735
minirst: remove unnecessary "elif:" statements
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 01:46:27 +0100] rev 9734
commands: call ui.username carefully in debuginstall
After c63c336ee2f7, 'hg debuginstall' would abort halfway through if
no username was set. We now catch and display the exception instead.
Martin Geisler <mg@lazybytes.net> [Sat, 07 Nov 2009 00:13:05 +0100] rev 9733
mq: do not call ui.username unless it is necessary
After changeset c63c336ee2f7, ui.username will abort by default if no
username is set. It is therefore wrong to call ui.username when a
username was provided on the command line.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 22:54:51 +0100] rev 9732
util: sort paths in walkrepos() (fixes test failures in test-hgwebdir)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 22:46:46 +0100] rev 9731
hgweb: treat rev as raw-rev if user agent is hg
Marti Raudsepp <marti@juffo.org> [Fri, 06 Nov 2009 13:48:17 +0200] rev 9730
patchbomb: fix 'echo -en' bashism in test-patchbomb
The echo command doesn't accept options in some shells.
printf is required by the SUSv2 (Single UNIX Specification v2).
Jesse Glick <jesse.glick@sun.com> [Thu, 05 Nov 2009 17:38:03 -0500] rev 9729
Issue919: add a standard extension to recreate hardlinks between repositories.
Having to run a standalone Python script from the contrib dir is a nuisance.
Also makes various improvements to locking, file discovery, etc.
Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories
Joel Rosdahl <joel@rosdahl.net> [Fri, 06 Nov 2009 08:28:45 +0100] rev 9728
tests: glog with style and file parameter (issue1896)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 06 Nov 2009 08:27:17 +0100] rev 9727
graphlog: don't pass filectxs to the templater (issue1896)
Augie Fackler <durin42@gmail.com> [Mon, 02 Nov 2009 11:03:22 -0500] rev 9726
keepalive: handle broken pipes gracefully during large POSTs
Yannick Gingras <ygingras@ygingras.net> [Thu, 05 Nov 2009 15:18:56 +0100] rev 9725
diff: add --inverse option
Most of the time, one can reverse a diff by swapping the revisions passed with
-r but it happens that if you use the global -R, and diff against the tip of
the current repo, you can't swap the revisions. One use-case for that is
reviewing changes from a bundle before unbundling. One could also pipe the
output of `hg diff` to a command line filter that reverses the diff, but that
would remove the benefit from color diffs. Therefore, having an option in
`hg diff` to reverse a diff is a good thing.
The option flag selection was tricky. GNU patch uses -R/--reverse but -R is
already used as a global option and --reverse would make --rev ambiguous.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:06:35 +0100] rev 9724
hgweb: keep original order from hgwebdir config files (issue1535)