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
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14671
scmutil: switch match users to supplying contexts
The most appropriate context is not always clearly defined. The obvious cases:
For working directory commands, we use None
For commands (eg annotate) with single revs, we use that revision
The less obvious cases:
For commands (eg status, diff) with a pair of revs, we use the second revision
For commands that take a range (like log), we use None
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14670
scmutil: match now accepts a context or a repo
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 14669
context: add a match builder method
This is groundwork for matching against filesets in contexts
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 18:24:54 -0300] rev 14668
help/hgignore: refer to the builtin help instead of external URLs
Mads Kiilerich <mads@kiilerich.com> [Sat, 18 Jun 2011 01:08:54 +0200] rev 14667
sslutil: make messages for Python without certificate handling more helpful
We now explain why there is no certificate to verify and do not give hints
about cacerts when they can't be used anyway.
Nicolas Bareil <nico@chdir.org> [Sat, 18 Jun 2011 01:03:03 +0200] rev 14666
sslutil: fall back to commonName when no dNSName in subjectAltName (
issue2798)
Any entries in subjectAltName would prevent fallback to using commonName, but
RFC 2818 says:
If a subjectAltName extension of type dNSName is present, that MUST
be used as the identity. Otherwise, the (most specific) Common Name
field in the Subject field of the certificate MUST be used.
We now only consider dNSNames in subjectAltName.
(dNSName is known as 'DNS' in OpenSSL/Python.)
Matt Mackall <mpm@selenic.com> [Fri, 17 Jun 2011 15:43:50 -0500] rev 14665
merge with i18n
Augie Fackler <durin42@gmail.com> [Fri, 17 Jun 2011 15:22:50 -0500] rev 14664
svn subrepos: work around checkout obstructions (
issue2752)
We do this by ensuring the working copy is clean and then blowing away
the working copy and replacing it with one from the desired path. We
could probably use 'svn switch' to do this more efficiently, but
there's some subtle logic required to get that right and this is
more likely to work reliably.