Martin Geisler <mg@lazybytes.net> [Sun, 04 Jul 2010 14:14:29 +0200] rev 11509
test-log: also test "log -p -R" case
Yuya Nishihara <yuya@tcha.org> [Fri, 02 Jul 2010 23:49:06 +0900] rev 11508
log: fix missing diff output for hg log -p in sub directory
prep(ctx, fns) receives paths relative to repository root, not cwd.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 04 Jul 2010 17:05:17 +0900] rev 11507
commands: document return values of add and paths commands
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:15:25 +0200] rev 11506
mergetools.hgrc: add vimdiff
Imported from deb_specific__mergetools patch in Debians patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:06:07 +0200] rev 11505
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:56:09 +0200] rev 11504
zeroconf: small fixes in docstring
Use reST role for consistency, import small part of Debian's
proposed_upstream__correct-zeroconf-doc patch from
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 02:03:55 +0200] rev 11503
hgweb: add link to wiki
Martin Geisler <mg@lazybytes.net> [Sat, 03 Jul 2010 01:48:50 +0200] rev 11502
hgweb.wsgi: add a URL to the corresponding wiki documentation
Imported for_upstream__add_doc_url_in_example_files.patch from
Debian's patch queue:
http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11501
churn: remove tuple parameter unpacking (deprecated in py3k)
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11500
record: removed 'reduce' calls (unsupported by py3k)
Quoting python's documentation, "Note that sum(range(n), m) is
equivalent to reduce(operator.add, range(n), m)". The "sum" function
is a builtin from 2.3 on and there's no reason for not to use it.
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:03 -0300] rev 11499
record: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11498
convert: tuple parameter unpacking is deprecated in py3k
Renato Cunha <renatoc@gmail.com> [Thu, 01 Jul 2010 19:27:02 -0300] rev 11497
revlog: Marked classic int divisions as such.
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:41:43 +0200] rev 11496
Merge with stable (again)
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:23:16 +0200] rev 11495
debugger: give a little intro before entering pdb
Mads Kiilerich <mads@kiilerich.com> [Wed, 30 Jun 2010 17:20:42 +0200] rev 11494
debugger: show traceback before entering pdb post-mortem
Martin Geisler <mg@aragost.com> [Fri, 02 Jul 2010 11:30:57 +0200] rev 11493
Merge with stable
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 19:13:23 -0500] rev 11492
wix: generate a new GUID for the help folder
A GUID change is recommended after changes like
159233cc9c14
Steve Borho <steve@borho.org> [Thu, 01 Jul 2010 12:53:37 -0500] rev 11491
wix: pick up new help topics added between 1.5 and 1.6
These files are not included the 1.6.0 installer, but will be picked up by
nightly builds as soon as this makes it to the stable branch.
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:31 -0500] rev 11490
Added signature for changeset
f786fc4b8764
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 12:06:30 -0500] rev 11489
Added tag 1.6 for changeset
f786fc4b8764
Mads Kiilerich <mads@kiilerich.com> [Tue, 29 Jun 2010 12:12:34 +0200] rev 11488
log: follow filenames through renames (
issue647)
In commands.log a displayer was initialized from
cmdutil.show_changeset() with the initial matchfn (which designates
the specified files which only is correct in the highest revision in
the range). prep() is handed the correct list of files, but
displayer.show() didn't use that list but keept using the original
matchfn.
The matchfn argument to cmdutil.show_changeset() wasn't specified in
other places and is only used in .show(), so now we give the matchfn
as an optional parameter to .show().
We do however still have to detect --patch and --stat from opts in
show_changeset() and let it imply a matchall, but that can now be
overruled with the new .show() matchfn parameter.
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 01 Jul 2010 13:26:08 -0300] rev 11487
i18n-pt_BR: synchronized with
d3c3e2fdeb0c
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:22:56 -0500] rev 11486
commit: add missing _()
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:20:13 -0500] rev 11485
subrepo: refuse to commit subrepos if .hgsub is excluded (
issue2232)
Matt Mackall <mpm@selenic.com> [Thu, 01 Jul 2010 11:20:08 -0500] rev 11484
Merge with i18n
Martin Geisler <mg@aragost.com> [Thu, 01 Jul 2010 15:25:29 +0200] rev 11483
i18n-da: translated eol extension and various small strings
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 30 Jun 2010 13:03:48 +0900] rev 11482
i18n-ja: synchronized with
13d02d6677f2
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Jun 2010 12:27:08 -0300] rev 11481
i18n-pt_BR: synchronized with
59af1d65029c
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Jun 2010 12:18:42 -0300] rev 11480
merge with stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 29 Jun 2010 09:11:55 +0200] rev 11479
i18n-sv: synchronized with
13d02d6677f2
Wagner Bruna <wbruna@yahoo.com> [Sat, 26 Jun 2010 21:37:10 -0300] rev 11478
i18n-pt_BR: synchronized with
9fa255c32406