Martin Geisler <mg@aragost.com> [Tue, 21 Jun 2011 14:00:26 +0200] rev 14703
merge with stable
David Soria Parra <dsp@php.net> [Tue, 21 Jun 2011 13:24:19 +0200] rev 14702
dispatch: translate alias debugging messages
Mads Kiilerich <mads@kiilerich.com> [Tue, 21 Jun 2011 00:17:52 +0200] rev 14701
parsers: fix localization markup of parser errors
Ollie Rutherfurd <orutherfurd@gmail.com> [Sun, 19 Jun 2011 22:33:25 -0400] rev 14700
fileset: use correct function name for hgignore in docstring
docstring refereed to "resolved" instead of "hgignore"
Matt Mackall <mpm@selenic.com> [Mon, 20 Jun 2011 16:45:33 -0500] rev 14699
url: catch UNC paths as yet another Windows special case (issue2808)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 20 Jun 2011 14:11:01 +0200] rev 14698
treediscovery: always return all remote heads
Old discovery only returned incoming heads, not all of them (for
changegroupsubset). New discovery must always return all of the remote heads
(for getbundle). I failed to properly adjust treediscovery in cb98fed52495
when introducing setdiscovery.
The actual observable problem was 'remote: unsynced changes' when trying
to push a cset on one named branch to a server with a new cset on another
named branch. This scenario is now tested in test-treediscovery.t.
Sune Foldager <cryo@cyanite.org> [Mon, 20 Jun 2011 11:08:41 +0200] rev 14697
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 20 Jun 2011 10:51:37 +0200] rev 14696
config.sortdict: override clear method
Overrides dict.clear. It's not currently used, but was broken for sortdict.
Contributed by Stepan Koltsov <yozh@mx1.ru>
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 20 Jun 2011 09:30:03 +0200] rev 14695
patch: fix typo in variable name
Martin Geisler <mg@aragost.com> [Mon, 20 Jun 2011 10:42:19 +0200] rev 14694
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 19:28:38 -0300] rev 14693
help/revsets: revset aliases can be defined on any config file
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 19:27:40 -0300] rev 14692
help/revsets: clean up whitespace between paragraphs
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 19:14:47 -0300] rev 14691
help/config: mention [revsetalias] section
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Jun 2011 11:43:40 +0200] rev 14690
fileset: add missing whitespace around operator
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 20:49:07 -0500] rev 14689
fileset: drop backwards SI size units
- the power of 2 ones should be kiB, MiB, etc.
- the power of 10 ones (SI standard) should be kB, MB, but we're currently
using the industry traditional units elsewhere
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 20:36:39 -0500] rev 14688
remove bogus test copy
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 17:03:01 -0500] rev 14687
merge default branch into stable to mark the start of the code freeze
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14686
fileset: add a help topic
Add crosslinking with patterns topic.
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14685
fileset: add copied predicate
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14684
fileset: add encoding() predicate
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14683
fileset: add size() predicate
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14682
fileset: add grep predicate
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14681
fileset: add some function help text
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14680
fileset: add hgignore
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14679
fileset: add resolved and unresolved predicates
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14678
fileset: prescan parse tree to optimize status usage
We only call status if needed to avoid walking the working directory
or comparing manifests.
Similarly, we scan for whether unknown or ignored files are mentioned
so we can include them.
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14677
fileset: add support for file status predicates
This forcibly walks the tree looking for unknown and ignored files,
which is suboptimal. A better approach would scan the tree first to
find required status components and skip the status check entirely if
it's unused.
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:49 -0500] rev 14676
fileset: add some basic predicates
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:53:44 -0500] rev 14675
match: introduce basic fileset support
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14674
match: allow passing a context object to match core
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14673
fileset: drop matchfn
This is now built into contexts
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14672
scmutil: match no longer accepts repo objects