Michael Bacarella <mbacarella@janestreet.com> [Fri, 09 Mar 2012 15:34:21 -0500] rev 16243
localrepo: fix unpushable repos when using bookmarks (issue3317)
bookmarks is copied to journal.bookmarks differently from how dirstate is
copied to journal.dirstate. The different way is less robust, which can render
the repo unpushable by other users if the first pushing user aborts their
transaction.
The underlying cause is that the copyfile method attempts an unnecessary chmod,
which fails if the user is not the owner of the journal.bookmarks file.
This patch makes the bookmarks journaling more consistent with the rest of the
journaling, and will allow users to update lingering journal.bookmarks files
that they're not the owners of.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 12 Mar 2012 09:39:30 +0100] rev 16242
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows
Use vim function fnameescape() on filenames.
Use double quotes for arguments so cmd.exe is happy.
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:47 -0600] rev 16241
posix: disable cygwin's symlink emulation
A. S. Budden <abudden@gmail.com> [Thu, 08 Mar 2012 20:17:36 +0000] rev 16240
posix: ignore execution bit in cygwin (issue3301)
Paul Boddie <paul@boddie.org.uk> [Sat, 18 Feb 2012 20:10:19 +0100] rev 16239
hgweb: support multi-level repository indexes by enabling descend and collapse
The descend option in hgweb can be used to display all reachable repositories
within a directory hierarchy if set to True. However, all reachable
repositories, regardless of their depth below the root of the hierarchy, are
then listed at the same level - expanded - in the hgweb interface. This patch
adds support for showing only each level of a directory hierarchy, with
subrepositories being shown alongside their parent repositories only at the
appropriate level (because there is no way to navigate to subrepositories from
within repositories), and the contents of directories hidden - collapsed -
behind a link for each directory. To enable this multi-level navigation, a new
option called collapse must be set to True when the descend option is set to
True.
Idan Kamara <idankk86@gmail.com> [Tue, 06 Mar 2012 18:43:05 +0200] rev 16238
mq: no need to delete undo files after strip
repair.strip takes care of that
Idan Kamara <idankk86@gmail.com> [Tue, 06 Mar 2012 18:43:05 +0200] rev 16237
repair: remove undo files after strip
Idan Kamara <idankk86@gmail.com> [Tue, 06 Mar 2012 18:42:52 +0200] rev 16236
localrepo: refactor retrieving of journal/undo files paths
We'd like to remove undo files after stripping
"Yann E. MORIN" <yann.morin.1998@free.fr> [Tue, 06 Mar 2012 23:23:30 +0100] rev 16235
templates/filters: strip quotes from {author|person}
RFC5322 (Internet Message Format) [0] says that the 'display name' of
an internet address [1] (what Mercurial calls 'person') can be quoted
with DQUOTE (ASCII 34: ") if it contains non-atom characters [2].
For example, dot '.' is a non-atom character. Also, DQUOTEs in a
quoted string will be escaped using "\" [2][3].
The current {author|person} template+filter just extracts the part
before an email address as-is. This can look ugly, especially on the
web interface, or when generating output for post-processing...
Moreover, as an example, the Mercurial repository has a bunch of
incoherent uses of DQUOTES in author names. As per Matt's digging:
$ hg log --template "{author|person}\n" | grep '"' | sort | uniq
"Andrei Vermel
"Aurelien Jacobs
"Daniel Santa Cruz
"Hidetaka Iwai
"Hiroshi Funai"
"Mathieu Clabaut
"Paul Moore
"Peter Arrenbrecht"
"Rafael Villar Burke
"Shun-ichi GOTO"
"Wallace, Eric S"
"Yann E. MORIN"
Josef "Jeff" Sipek
Radoslaw "AstralStorm" Szkodzinski
Fix the 'person' filter to remove leading and trailing DQUOTES,
and unescape remaining DQUOTES.
Given this author: "J. \"random\" DOE" <john@doe.net>
before: {author|person} : "J. \"random\" DOE"
after: {author|person} : J. "random" DOE
For the Mercurial repository, that leaves us with two authors with
DQUOTES, in acceptable positions:
$ hg log --template "{author|person}\n" | grep '"' | sort | uniq
Josef "Jeff" Sipek
Radoslaw "AstralStorm" Szkodzinski
[0] https://tools.ietf.org/html/rfc5322
[1] https://tools.ietf.org/html/rfc5322#section-3.4
[2] https://tools.ietf.org/html/rfc5322#section-3.2.4
[3] https://tools.ietf.org/html/rfc5322#section-3.2.1
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:44 -0600] rev 16234
check-code: check for % inside _()
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:41 -0600] rev 16233
patchbomb: add (optional) note to 0 of 0 prompt
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 15:59:33 -0600] rev 16232
merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2012 13:35:27 -0600] rev 16231
i18n: fix all remaining uses of % inside _()
Javi Merino <cibervicho@gmail.com> [Wed, 07 Mar 2012 23:21:11 +0000] rev 16230
update: don't translate the abort message twice
The string representation of util.Abort() is translated when
merge.update() raises the exception. For languages with characters
out of the valid ascii range, if we feed them again to i18n.gettext()
mercurial dies with:
[...]
File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/commands.py", line 4287, in postincoming
ui.warn(_("not updating: %s\n" % str(inst)))
File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/i18n.py", line 42, in gettext
u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs])
File "/usr/lib/python2.7/gettext.py", line 404, in ugettext
return unicode(message)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14: ordinal not in range(128)
To reproduce this error, just try to pull a changeset that crosses
branches with LANG=ru_RU.UTF-8
Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 17:14:30 -0600] rev 16229
merge with stable