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
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.
Augie Fackler <durin42@gmail.com> [Fri, 17 Jun 2011 15:21:02 -0500] rev 14663
update: check wc.dirty() before setting overwrite=True
merge.update() was missing a few dirtiness checks from workingcontext,
including subrepo cleanliness checks. Using wc.dirty() instead of
one-off checks for various forms of dirtiness will be significantly
safer.
Steve Borho <steve@borho.org> [Thu, 16 Jun 2011 15:26:17 -0500] rev 14662
tags: don't allow environment errors to be raised from _writetagscache
See https://bitbucket.org/tortoisehg/thg/issue/719
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 13:31:23 -0300] rev 14661
help/config: replace docutils markup
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 17 Jun 2011 12:23:12 -0300] rev 14660
test-i18n, i18n-pt_BR: update test message
This changes both a test and a translation, so I'm sending
a patch; please let me know if I should push this directly
to i18n instead.
Matt Mackall <mpm@selenic.com> [Fri, 17 Jun 2011 15:36:56 -0500] rev 14659
config: undo change of empty line definition
We don't allow spaces in front of comment markers
Patrick Mezard <pmezard@gmail.com> [Fri, 17 Jun 2011 20:33:02 +0200] rev 14658
patch: make filestore store data in memory and fallback to fs
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 10:40:23 +0200] rev 14657
i18n: merge in latest Romanian translations
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Wed, 08 Jun 2011 17:06:29 +0200] rev 14656
i18n-ro: synchronized with 3c7907dc95ca
Daniel Dumitriu <daniel.dumitriu@gmail.com> [Wed, 08 Jun 2011 15:17:23 +0200] rev 14655
i18n-ro: outstanding changes
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:52:37 -0300] rev 14654
help/config: quote config section names consistently
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:42:19 -0300] rev 14653
help/config: fix small typo
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:30:57 -0300] rev 14652
help/config: do not refer to config files as hgrc files
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 16 Jun 2011 12:30:44 -0300] rev 14651
help/config: fix 'Mercurial' casing
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 16 Jun 2011 22:47:34 +0200] rev 14650
revset: add desc(string) to search in commit messages
Like keyword(), but does not search in filenames and users.
No grepdesc() or descgrep() added, because it might be bad to introduce
grepfoo() versions of too many string searches.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 16 Jun 2011 22:03:26 +0200] rev 14649
revset: update sorting of symbols
Matt Mackall <mpm@selenic.com> [Thu, 16 Jun 2011 14:33:06 -0500] rev 14648
http: fix variable name in unexpected response message
Idan Kamara <idankk86@gmail.com> [Fri, 03 Jun 2011 17:27:41 +0300] rev 14647
serve: add --cmdserver option to communicate with hg over a pipe
Idan Kamara <idankk86@gmail.com> [Wed, 15 Jun 2011 23:15:04 +0300] rev 14646
localrepo: don't attempt to open .hgtags twice if the error isn't ENOENT
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Jun 2011 01:58:00 +0200] rev 14645
log: do not display hidden changeset
We add a --hidden option to display them.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Jun 2011 01:57:59 +0200] rev 14644
hidden: Add ``hidden`` method for context
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Thu, 16 Jun 2011 01:57:53 +0200] rev 14643
hidden: Add a hiddenrevs attributes to changelog.
This attributes hold the set of all revisions that should be ommited by command
and tools displaying changesets.
This set is given as a hit. Command and tools are responsible to check it in
order to filter they outpur.
Code adding revisions to the set are responsible to the consistency of it's
data.
Matt Mackall <mpm@selenic.com> [Thu, 16 Jun 2011 13:24:44 -0500] rev 14642
config: handle comment lines in continuations (issue2854)
Matt Mackall <mpm@selenic.com> [Thu, 16 Jun 2011 13:24:42 -0500] rev 14641
http: report unexpected unparsable push responses (issue2777)
Idan Kamara <idankk86@gmail.com> [Tue, 07 Jun 2011 13:39:09 +0300] rev 14640
dispatch: write shell alias output to ui out descriptor
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14639
commands: use ui descriptors when reading/writing from stdin/out
Idan Kamara <idankk86@gmail.com> [Wed, 15 Jun 2011 23:50:33 +0300] rev 14638
cmdutil: return a dummy, closable file object if it cannot be duped
If the ui I/O descriptors aren't real descriptors, they cannot be duped.
Instead, we return a wrapper object that behaves the same, and
can be closed (by overriding close and doing nothing).
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14637
cmdutil: use ui descriptors in makefileobj
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14636
mq: use ui.fin when importing patch from '-'