Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 12:37:29 +0200] rev 14726
revert: mention update in hint of abort when reverting to non-parent
and explicitly warn about uncommitted changes
Examples:
BEFORE:
$ hg par -q
7:e81a2efd53d4
$ hg revert -r 2
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
Clean working directory (revert can be easily undone, no edits to be lost):
$ hg revert -r 2
abort: no files or directories specified
(use --all to revert all files, or 'hg update 2' to update)
Uncommitted changes (revert --all *does* discard edits and is pretty hard to
undo or even impossible if --no-backup is specified):
$ hg revert -r 2
abort: no files or directories specified
(uncommitted changes, use --all to discard all changes, or 'hg update 2' to update)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 10:51:05 +0200] rev 14725
update: clarify that update changes the parent revison
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 00:21:00 -0500] rev 14724
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 22 Jun 2011 01:55:00 +0200] rev 14723
revset: fix aliases with 0 or more than 2 parameters
The existing code seemed to have incorrect assumptions about how parameter
lists are represented by the parser.
Now the match and replace functions have been merged and simplified by using
getlist().
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 23 Jun 2011 14:40:57 +0200] rev 14722
match: fix bug caused by refactoring in cfc89398f710
Adrian Buehlmann <adrian@cadifra.com> [Wed, 22 Jun 2011 15:34:33 +0200] rev 14721
revert: be more helpful on uncommitted merges
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
$ hg revert
abort: no files or directories specified
(uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
Adrian Buehlmann <adrian@cadifra.com> [Wed, 22 Jun 2011 10:13:44 +0200] rev 14720
opener: add self._audit (issue2862)
Idan Kamara <idankk86@gmail.com> [Wed, 22 Jun 2011 17:13:04 +0300] rev 14719
cmdserver: write the hello message as one chunk on the 'o' channel
This is a guaranteed by the protocol: clients know they need to read one chunk
off of the 'o' channel and treat that as the hello message.
They should ignore fields they don't recognize so they stay compatible with
new versions of the server in case we decide to add something.
Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Jun 2011 01:10:35 +0200] rev 14718
fileset: copied takes no arguments
Mads Kiilerich <mads@kiilerich.com> [Wed, 22 Jun 2011 01:55:00 +0200] rev 14717
revset and fileset: fix typos in parser error messages
Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Jun 2011 00:18:41 +0200] rev 14716
fileset: use ParseError pos field correctly
The pos field is intended to describe the position of the error - it should not
be used for other potentially interesting information.
Mads Kiilerich <mads@kiilerich.com> [Fri, 24 Jun 2011 00:18:06 +0200] rev 14715
revset: fix parameter name in implementation of follow()
Matt Mackall <mpm@selenic.com> [Tue, 21 Jun 2011 17:27:20 -0500] rev 14714
merge with stable
Kevin Bullock <kbullock@ringworld.org> [Mon, 20 Jun 2011 22:15:52 -0500] rev 14713
revert: be more explicit that changes are lost
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to revert all files)
AFTER:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
Idan Kamara <idankk86@gmail.com> [Tue, 21 Jun 2011 17:08:21 +0300] rev 14712
dispatch: do not close the request repo
Closing here means we've closed the repo passed to us in the request,
which is not our responsibility.
This is essential for bundlerepo, and possibly other localrepository
subclasses who do something in their close().
Idan Kamara <idankk86@gmail.com> [Tue, 21 Jun 2011 16:55:21 +0300] rev 14711
hook: write hook output to ui fout descriptor
output on stderr will also be written to ui.fout, unless sys.__stdout__
is passed in (see util.system), thus not changing previous behavior.
This fixes a bug where hooks run through the command server would mess up
with the command protocol, sending non-channeled data to the client.
Matt Mackall <mpm@selenic.com> [Tue, 21 Jun 2011 15:26:44 -0500] rev 14710
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 21 Jun 2011 15:21:57 -0500] rev 14709
check-code: don't mark debug messages for translation
David Soria Parra <dsp@php.net> [Tue, 21 Jun 2011 18:35:13 +0200] rev 14708
i18n: remove translation of debug messages
Idan Kamara <idankk86@gmail.com> [Tue, 21 Jun 2011 15:38:10 +0300] rev 14707
cmdserver, runcommand: properly handle the client sending no arguments
No real reason for a client to do this, but still possible.
Previously if the client sent no arguments, a list with an empty string ['']
would be used as the arguments to dispatch, which would cause hg to complain
about an ambiguous command.
Instead, we simply check for no arguments and use an empty list instead (which
is equivalent to invoking hg with no args on the command line).
Idan Kamara <idankk86@gmail.com> [Tue, 21 Jun 2011 15:13:39 +0300] rev 14706
cmdserver: don't raise EOFError when trying to read 0 bytes from the client
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 20 Jun 2011 19:08:41 -0300] rev 14705
i18n: extract docstrings from fileset module
Martin Geisler <mg@aragost.com> [Tue, 21 Jun 2011 14:57:17 +0200] rev 14704
Backed out changeset 1ec8bd909ac3
Debug messages should not be translated.
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
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 '-'
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:52 +0300] rev 14635
cmdutil, logmessage: use ui.fin when reading from '-'
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 15 Jun 2011 17:04:06 -0300] rev 14634
dagutil: fix missing import of i18n._
Satish Balay <balay@fastmail.fm> [Thu, 16 Jun 2011 19:34:42 +0200] rev 14633
hgmanpage: adapt to Docutils 0.8 API change
Martin Geisler <mg@aragost.com> [Thu, 16 Jun 2011 08:49:26 +0200] rev 14632
manifest: use "\0" instead of "\000"
Though both give the same result (a NUL byte), I found that I tend to
read "\000" as "\0" + "00", which is something completely different.
I did not change the occurance of "\000" in archival.py since there
are other octal constants in that file.
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 17:25:58 +0200] rev 14631
commands: add pointer to bookmarks command in branch help
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 17:10:26 +0200] rev 14630
glossary: add entry for "Bookmark"
Martin Geisler <mg@aragost.com> [Wed, 15 Jun 2011 17:10:16 +0200] rev 14629
glossary: add entry for "Tag"
Matt Mackall <mpm@selenic.com> [Tue, 14 Jun 2011 20:43:04 -0500] rev 14628
merge with i18n
Alexander Sauta <demosito@gmail.com> [Tue, 14 Jun 2011 00:31:56 +0400] rev 14627
i18n-ru: translated all standard commands and config-environment additional help topics
Alexander Sauta <demosito@gmail.com> [Fri, 10 Jun 2011 01:39:22 +0400] rev 14626
i18n-ru: translated push-rename
Alexander Sauta <demosito@gmail.com> [Thu, 09 Jun 2011 20:37:32 +0400] rev 14625
i18n-ru: translated parents-pull
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:58:00 +0200] rev 14624
setdiscovery: batch heads and known(ownheads)
This means that we now discover both subset conditions (local<remote and
remote<local) in a single roundtrip without ever constructing an actual
sample (which takes a bit of client CPU).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:56:20 +0200] rev 14623
wireproto: make a number of commands batchable
Makes lookup, heads, known, branchmap, pushkey, and listkeys batchable.
It could, for instance, be interesting to use this to batch calls to
lookup when a pull or clone has multiple --rev arguments. The next patch
is going to batch heads and known to slightly tune discovery.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:52:58 +0200] rev 14622
wireproto: add batching support to wirerepository
Adds the plumbing and wire call for batched execution, but does not
batch-enable any methods yet.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 14 Jun 2011 22:51:26 +0200] rev 14621
wireproto: add basic command batching infrastructure
Note that localbatch will not be used until we actually have a localpeer to
use it with.
Yuya Nishihara <yuya@tcha.org> [Wed, 15 Jun 2011 01:50:49 +0900] rev 14620
mq: make qrefresh/qfold keep wlock until saving patch status
Because q.refresh() changes nodeid, .hg/patches/status gets invalid until
q.savedirty(). This patch changes mq not to unlock repository of incomplete
state.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 14 Jun 2011 20:08:35 -0300] rev 14619
bugzilla: fix typo in documentation
Idan Kamara <idankk86@gmail.com> [Tue, 14 Jun 2011 20:25:38 +0300] rev 14618
dispatch: fix for-loop variable name
Ingo Bressler <dev@ingobressler.net> [Tue, 14 Jun 2011 13:29:25 +0200] rev 14617
notify: send changesets on 'outgoing' hook, updated doc
Stephen Thorne <stephen@thorne.id.au> [Tue, 14 Jun 2011 13:31:32 +1000] rev 14616
sslutil: Restore missing imports of socket and httplib to sslutil
Two imports were omitted in the restructure of the code creating
sslutil.py, socket and httplib are required when the 'ssl' module
cannot be imported, restoring these imports allows mercurial to run
on python2.4+2.5.
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 14:54:47 +0300] rev 14615
dispatch: assign I/O descriptors from the request to the ui
Idan Kamara <idankk86@gmail.com> [Wed, 08 Jun 2011 01:39:20 +0300] rev 14614
ui: use I/O descriptors internally
and as a result:
- fix webproto to redirect the ui descriptors instead of sys.stdout/err
- fix sshserver to use the ui descriptors
Idan Kamara <idankk86@gmail.com> [Tue, 07 Jun 2011 13:39:09 +0300] rev 14613
dispatch: add I/O descriptors to the request
Idan Kamara <idankk86@gmail.com> [Tue, 07 Jun 2011 13:39:09 +0300] rev 14612
ui: add I/O descriptors
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Jun 2011 23:26:35 +0200] rev 14611
import: add --bypass option
This feature is more a way to test patching without a working directory than
something people asked about. Adding a --rev option to specify the parent patch
revision would make it a little more useful.
What this change introduces is patch.repobackend class which let patches be
applied against repository revisions. The caller must supply a filestore object
to receive patched content, which can be turned into a memctx with
patch.makememctx() helper.
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Jun 2011 23:24:40 +0200] rev 14610
import: separate parents selection from working dir update
This will be useful when patching without updating the dirstate
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Jun 2011 23:24:34 +0200] rev 14609
patch: extend filtestore to store an optional copy source
This will help wrapping filestores in memctx.
Martin Geisler <mg@aragost.com> [Tue, 14 Jun 2011 16:38:34 +0200] rev 14608
paper/coal: use fixed width for diffstat +/- link
The plus and minus characters are normally not the same width in a
non-monospace font, and this made the line length change when the
diffstat display was toggled.
The square brackets are not rendered in a monospace font to ensure
that they align with the parenthesis on the same line.
Martin Geisler <mg@aragost.com> [Tue, 14 Jun 2011 16:33:46 +0200] rev 14607
hg: rename opts argument to peeropts in clone
This should make it clearer that the options are used with remoteui
only and are not used otherwise in hg.clone.
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 16:25:18 -0500] rev 14606
hg: move peerschemes back to schemes
This will avoid breaking things with extensions until peers are fully
separated from repos.
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 14:53:23 -0500] rev 14605
hg: rearrange peer scheme lookup
There is now only peer scheme lookup. Repository lookup goes through
peer scheme lookup. When peer and repo types are finally separated,
repo lookup will use peer.local() to get a repository object.
The underbar is dropped so that extensions can patch the table.
Idan Kamara <idankk86@gmail.com> [Mon, 13 Jun 2011 14:56:00 +0300] rev 14604
forget, remove: don't note on nonexistent file twice
before:
$ hg forget foo
foo: No such file or directory
not removing foo: file is already untracked
after:
$ hg forget foo
foo: No such file or directory
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 12:51:38 -0500] rev 14603
localrepo: local() returns self
Temporary measure for introducing peers
Matt Mackall <mpm@selenic.com> [Mon, 13 Jun 2011 12:51:37 -0500] rev 14602
tests: avoid instability in test-convert-cvs-synthetic
Idan Kamara <idankk86@gmail.com> [Mon, 13 Jun 2011 00:19:26 +0300] rev 14601
dispatch: propagate ui command options to the local ui (issue2523)
so the ui object passed to pre/post python hooks has the verbose flag
(and the rest) set correctly
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 23:30:39 +0300] rev 14600
mq: catch correct exception when calling changelog.rev()
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 17:26:58 +0300] rev 14599
rebase: preserve mq series order after rebasing (issue2849)
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 17:26:20 +0300] rev 14598
run-tests: verbose log ignored test
Ingo Proetel <proetel@aicas.de> [Fri, 10 Jun 2011 10:58:10 +0200] rev 14597
record: add white space diff options
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:53:58 +0200] rev 14596
mq: rename abort_if_wdir_patched to abortifwdirpatched
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:48:47 +0200] rev 14595
mq: rename partial_name to partialname
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:47:21 +0200] rev 14594
mq: rename write_list to writelist
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:45:48 +0200] rev 14593
mq: rename series_dirty to seriesdirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:44:34 +0200] rev 14592
mq: rename applied_dirty to applieddirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:43:03 +0200] rev 14591
mq: rename guards_dirty to guardsdirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:41:58 +0200] rev 14590
mq: rename active_guards to activeguards
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:40:35 +0200] rev 14589
mq: rename guards_path to guardspath
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:39:14 +0200] rev 14588
mq: rename status_path to statuspath
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 13:38:04 +0200] rev 14587
mq: rename series_path to seriespath
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:11:49 +0200] rev 14586
mq: rename series_end to seriesend
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:09:29 +0200] rev 14585
mq: rename full_series_end to fullseriesend
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:07:46 +0200] rev 14584
mq: rename check_reserved_name to checkreservedname
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:06:32 +0200] rev 14583
mq: rename check_localchanges to checklocalchanges
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:05:20 +0200] rev 14582
mq: rename check_substate to checksubstate
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:03:38 +0200] rev 14581
mq: rename check_toppatch to checktoppatch
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:02:14 +0200] rev 14580
mq: rename save_dirty to savedirty
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 12:00:56 +0200] rev 14579
mq: rename explain_pushable to explainpushable
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:59:35 +0200] rev 14578
mq: rename set_active to setactive
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:58:16 +0200] rev 14577
mq: rename set_guards to setguards
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:57:21 +0200] rev 14576
mq: rename check_guard to checkguard
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:55:46 +0200] rev 14575
mq: rename parse_series to parseseries
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:54:25 +0200] rev 14574
mq: rename find_series to findseries
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:40:27 +0200] rev 14573
mq: rename series_guards to seriesguards
Adrian Buehlmann <adrian@cadifra.com> [Mon, 13 Jun 2011 11:06:11 +0200] rev 14572
mq: rename full_series to fullseries
Steven Brown <StevenGBrown@gmail.com> [Sat, 11 Jun 2011 21:24:50 +0800] rev 14571
paper, coal: display diffstat on the changeset page
Displayed in a row of the changeset summary table, underneath the list of
files. When the page is loaded, only the diff summary is displayed. The full
diffstat is only displayed when the [+] link is selected.
Steven Brown <StevenGBrown@gmail.com> [Sat, 11 Jun 2011 21:11:43 +0800] rev 14570
web: provide diff summary to the changeset page
This is the same message displayed at the end of the "diff --stat" command.
For example, "9 files changed, 1651 insertions(+), 2 deletions(-)".
The webutil.diffstatgen function allows the diffstat data to be lazily
calculated only once and then re-used.
Matt Mackall <mpm@selenic.com> [Sat, 11 Jun 2011 14:14:53 -0500] rev 14569
tests: fix up date ambiguity in cvs test
Matt Mackall <mpm@selenic.com> [Sat, 11 Jun 2011 14:14:52 -0500] rev 14568
hg: split peer and repo lookup tables
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:40:25 +0200] rev 14567
tests: rename test-git-import.t into test-import-git.t
This is consistent with other test-import* tests.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:17:25 +0200] rev 14566
patch: generalize the use of patchmeta in applydiff()
- Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta
instances in applydiff() makes things simpler.
- Rename selectfile() into makepatchmeta(). It is responsible for creating
patchmeta for regular patches.
- Pass patchmeta objects to patchfile() directly
patchmeta instances were associated with git patches, for regular patches we
had to pass additional variables to tell the patch intent to patchfile().
Instead, we generate patchmeta for regular patches and pass them. This will
also help with patch filtering by matcher objects.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:13 +0200] rev 14565
patch: stop updating changed files set in applydiff()
This information is more correctly returned by backends.
The extra updated file removed from test-mq-merge.t output came from changes
from git patches being counted before being really applied in some cases.
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:14:11 +0200] rev 14564
patch: turn patch() touched files dict into a set
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:19:39 +0800] rev 14563
paper, coal: define the diffstat templates
The templates output the filename, the total number of changes to the file
and a bar graph of the adds and removes. The filename is a link into the diff
output.
The diffstat is not yet displayed, but it can be manually added to the
changeset page template.
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:15:49 +0800] rev 14562
web: provide the file number to the diffstat templates
This allows the diffstat templates to link into the diff output. For example,
the URLs of the first three files within the diff are #l1.1, #l2.1, #l3.1.
Steven Brown <StevenGBrown@gmail.com> [Thu, 09 Jun 2011 01:14:22 +0800] rev 14561
web: include all files in the diffstat
The webutil.diffstat function now returns a diffstat template for each file
in the diff. It previously returned a template for each file returned by
ctx.files() which did not work well for merge changesets.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 20:38:02 +0200] rev 14560
hgignore: ignore MANIFEST.in (generated since 2ce7dfe17bc5)
LUO Zheng <xmuluo@gmail.com> [Wed, 08 Jun 2011 21:25:18 +0800] rev 14559
bookmarks: recognize the current bookmark when the local encoding isn't UTF-8
The current bookmark is stored in bookmark.current, supposingly in UTF-8.
But the call to encoding.fromlocal() is missing, therefore Hg is not able
to recognize the current bookmark in the case that bookmark uses
characters of which the bit stream is different between local encoding
and UTF-8.
For example, the Chinese version of Windows cmd uses gbk(cp936), not UTF-8.
Therefore I won't be able to make a Chinese bookmark current.
By wrapping mark in a encoding.fromlocal() call, the problem is solved.
Stephen Thorne <stephen@thorne.id.au> [Thu, 09 Jun 2011 10:15:24 +1000] rev 14558
distutils: Create MANIFEST.in instead of MANIFEST in Makefile
When running 'python setup.py sdist' many files were omitted from the resulting
tarball that are required for a complete build, including the .h file for the
inotify extension due to a python2.7+ distutils bug. This would cause 'make dist'
to fail to build a correct dist on python2.7
By building a MANIFEST.in that is the same as the old MANIFEST with 'include'
at the start of each line will cause a correct MANIFEST to be built and used
by distutils.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 09 Jun 2011 18:39:14 +0200] rev 14557
revert: is reverting file states, not just file contents
e.g. x bit is reverted as well
Also makes this paragraph more consistent with the preceding one,
which already uses the term "state" (not "content").
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14556
hg: change various repository() users to use peer() where appropriate
This gets all the easy cases (peers that aren't also used as repositories).
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14555
hg: have peer() call _lookup directly
Note that this means that peers no longer call the extension
repository setup hooks.
Matt Mackall <mpm@selenic.com> [Fri, 10 Jun 2011 11:43:38 -0500] rev 14554
hg: add peer method
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 08 Jun 2011 18:24:33 +0200] rev 14553
hg: add opts argument to clone for internal remoteui
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:18:35 +0200] rev 14552
hg: use capable instead of capabilities
Matt Mackall <mpm@selenic.com> [Wed, 08 Jun 2011 13:44:41 -0500] rev 14551
fileset: basic pattern and boolean support
debugfileset can now generate file lists for things like:
"* and not hg*"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Jun 2011 16:50:45 +0200] rev 14550
tests: fix updated monotone version requirement
0969d91fad5c only updated the comment, not the actual check.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 17:02:54 -0500] rev 14549
check-code: catch misspellings of descendant
This word is fairly common in Mercurial, and easy to misspell.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:02:51 -0500] rev 14548
revert: drop obvious paragraph about filenames
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 16:01:38 -0500] rev 14547
revert: actually add pointer to backout
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:54:17 -0500] rev 14546
revert: replace mention of 'roll back' with pointer to 'backout'
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:51:18 -0500] rev 14545
revert: simplify description of effect of -r
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:49:04 -0500] rev 14544
revert: rearrange the date help
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:47:54 -0500] rev 14543
revert: remove some redundancy in basic description
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:19:05 -0500] rev 14542
revert: drop requirement to use -r to revert with two parents
This reduces documentation confusion between the need to:
a) hg revert -a -r . (drop all changes from a merge)
b) hg up -C . (drop the second parent entirely)
Currently revert is one of two commands (the other being tag) that
still complains about uncommitted merges, dating from its former use
of a generic defaultrev function that aborted.
Matt Mackall <mpm@selenic.com> [Tue, 07 Jun 2011 14:18:39 -0500] rev 14541
revert: simplify usage note
This points people looking for other commands to the right place with
a minimum of verbiage.
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 17:38:32 -0500] rev 14540
revert: rewrite help summary
New users have a tendency to mistake 'revert' as the command to use to
check out old revisions. They also occasionally mistake revert for a
generalized undo (compare rollback).
This version intentionally aims to avoid mentioning 'earlier' and thus
intentionally no longer alludes to the (secondary) -r behavior (which
in fact is not actually limited to 'earlier').
Instead, we mention checkout state, to convey that we can
restore things to the way they were when checked out.
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:19:30 +0900] rev 14539
extensions: make disabled()/disabledext() load prebuilt index if available
__index__ contains a dict of {name: desc} of all extensions.
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:11:10 +0900] rev 14538
setup: add command to generate index of extensions
It generates prebuilt index of all extensions, which will be used by
frozen exe when running 'hg help extensions'.
Now py2exe invokes this command automatically.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 06 Jun 2011 21:02:48 +0200] rev 14537
sshrepo: fix addchangegroup's signature
Make it mirror the usage found in localrepo.push. This should only
affect pushes to pre-unbundle ssh servers.
Matt Mackall <mpm@selenic.com> [Mon, 06 Jun 2011 15:17:40 -0500] rev 14536
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
We shouldn't try to process subrepos if .hgsub isn't present and we
should remove .hgsubstate if .hgsub is marked for removal.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:26:01 +0200] rev 14535
patch: dot not ignore hunk of files marked as 'deleted'
git 'deleted' flag was processed unconditionnally and the file removed even if
the related hunk was not matching.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:19 +0200] rev 14534
patch: fix patchmeta/hunk synchronization in iterhunks()
Synchronizing on bfile does not work on file removal where bfile is /dev/null.
We match items on afile or bfile instead. The incorrect code makes iterhunks()
to emit patchmeta and hunks separately in some cases. This is currently hidden
by applydiff() being too tolerant when processing patchmeta, and will be fixed
later.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:11 +0200] rev 14533
patch: remove unnecessary exists() call in selectfile()
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 22:24:02 +0200] rev 14532
import: deprecate --base
This option was a convenient hack introduced in Mercurial early days which
unfortunately survived until now.
Patrick Mezard <pmezard@gmail.com> [Sun, 05 Jun 2011 13:27:06 +0200] rev 14531
patch: remove redundant islink() call
Yuya Nishihara <yuya@tcha.org> [Sat, 04 Jun 2011 20:01:01 +0900] rev 14530
extensions: update doc of enabled() and disabled() according to d5b525697ddb
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:56:48 +0200] rev 14529
localrepo: add savecommitmessage() to write last-message.txt
Patrick Mezard <pmezard@gmail.com> [Sat, 04 Jun 2011 15:20:49 +0200] rev 14528
memctx: simplify constructor
Matt Mackall <mpm@selenic.com> [Fri, 03 Jun 2011 15:08:08 -0500] rev 14527
scmutil: improve path calculation for install-relative RC files (issue2841)
This code was ugly and might do the wrong thing with symlinks.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 13:10:22 +0200] rev 14526
prepush: show details about new remote heads with --verbose
previously, this info was only shown with --debug
Note that the new remote heads are only shown if the command aborts,
that is, they are *not* shown if --force was specified.
See also change 91cb08a9e7fb.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 12:16:17 +0200] rev 14525
prepush: print short hash of first new head in abort message
and don't mention the branch if it's the default branch.
OLD:
$ hg push ../a
pushing to ../a
searching for changes
abort: push creates new remote heads on branch 'default'!
(you should pull and merge or use push -f to force)
NEW:
$ hg push ../a
pushing to ../a
searching for changes
abort: push creates new remote head 1e108cc5548c!
(you should pull and merge or use push -f to force)
This helps to identify which local head is causing troubles.
See also change 91cb08a9e7fb.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 03 Jun 2011 11:26:43 +0200] rev 14524
prepush: eliminate 'if branch'
branch is always set anyway
No change in program behavior.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:32:54 +0200] rev 14523
revlog: bail out earlier in group when we have no chunks
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:23:32 +0200] rev 14522
localrepo: simplify file bundling code and fix progress bug
Progress for files was off by one, and the code was rather hackish.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:15:06 +0200] rev 14521
localrepo: use list comprehension instead of generators
The lists in question are iterated and kept in memory further down the code
path anyway, and this simplifies things.
Sune Foldager <cryo@cyanite.org> [Fri, 03 Jun 2011 20:12:37 +0200] rev 14520
localrepo: add total to changeset progress in bundle/push
Martin Geisler <mg@aragost.com> [Fri, 03 Jun 2011 20:08:26 +0200] rev 14519
statichttprepo: use in-place difference for shorter line
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Jun 2011 00:33:33 +0200] rev 14518
workingctx: eliminate remove function
Inlining it into it's last remaining call place in cmdutil.copy.
Note that cmdutil.copy is called with the wlock already held, so no additional
locking is needed to call util.unlinkpath.
We do not need to wrap the util.unlinkpath call into a try block, because
at that point we already know whether abssrc exists or not -- thanks to the
preceding util.copyfile call. Adding a new local 'srcexists' in cmdutil.copy
for that purpose.
Adrian Buehlmann <adrian@cadifra.com> [Thu, 02 Jun 2011 19:43:17 +0200] rev 14517
test-copy2: add case for moving a missing file
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14516
color: check if ui is already a subclass of colorui before wrapping it
since it's possible to reuse the ui object (see 80c599eee3f3)
between dispatch calls, the ui might have been wrapped already.
we could probably move this test up a bit but leaving it here
allows updates to take effect by extstyles() and configstyles().
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14515
util: add helper function isatty(fd) to check for tty-ness
Steven Brown <StevenGBrown@gmail.com> [Thu, 02 Jun 2011 18:52:31 +0800] rev 14514
web: prevent TypeError thrown when using the diffstat templates
Remove the lambda used to wrap webutil.diffstat because:
- functions passed to the templater must accept keyword arguments
- webutil.diffstat is a generator, so already calculates the diffstat lazily
This reverts the changes made to 1d3e2349304a after it was submitted to the
mailing list but before it was queued.
Matt Mackall <mpm@selenic.com> [Thu, 02 Jun 2011 11:27:40 -0500] rev 14513
fileset: fix long line
Matt Mackall <mpm@selenic.com> [Thu, 02 Jun 2011 11:17:02 -0500] rev 14512
COPYING: refresh with current address from fsf.org
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 19:12:18 -0500] rev 14511
filesets: introduce basic fileset expression parser
Idan Kamara <idankk86@gmail.com> [Thu, 02 Jun 2011 00:43:34 +0300] rev 14510
dispatch: add repo to the request
allows callers of dispatch.dispatch to pass in
an initialized repo object to be used.
-R/--repository overrides the request repo.
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:42:50 -0500] rev 14509
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:32:48 -0500] rev 14508
Added signature for changeset 733af5d9f6b2
Matt Mackall <mpm@selenic.com> [Wed, 01 Jun 2011 16:32:44 -0500] rev 14507
Added tag 1.8.4 for changeset 733af5d9f6b2
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 19:49:17 -0500] rev 14506
subrepo: make stdin for svn a pipe for non-interactive use (issue2759)
This certainly can't hurt, so go ahead and do it, potentially along
with --non-interactive if that flag is safe for the given subcommand.
Regis Desgroppes <regis.desgroppes@nokia.com> [Tue, 31 May 2011 16:22:04 -0500] rev 14505
subrepo: svn abort now depends on exit code (issue2833)
Matt Mackall <mpm@selenic.com> [Tue, 24 May 2011 17:16:31 -0500] rev 14504
httprepo: send URL redirection notices to stderr (issue2828)
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Mar 2011 14:47:30 +0100] rev 14503
httprepo: proper handling of invalid responses without content-type (issue2019)
This can currently be tested on http://sf.net/
Patrick Mezard <pmezard@gmail.com> [Fri, 29 Apr 2011 14:56:23 +0200] rev 14502
strip: make it clear that --force discards changes (issue310)
Matt Mackall <mpm@selenic.com> [Tue, 26 Apr 2011 10:51:19 -0500] rev 14501
tags: catch more corruption during cache parsing (issue2779)
Idan Kamara <idankk86@gmail.com> [Mon, 11 Apr 2011 21:44:22 +0300] rev 14500
localrepo: don't add deleted files to list of modified/added files (issue2761)
If a file is deleted (rm, not 'hg rm') from the working dir
an attempt to run 'hg diff -r X', with the file being present in X will
cause an abort.
We didn't check if the file has been deleted from the working dir
and later on tried to open it to compare with the one from X, causing the abort.
This fix adds that check. Consequently, no output will be returned.
Idan Kamara <idankk86@gmail.com> [Mon, 04 Apr 2011 22:51:10 +0300] rev 14499
localrepo: ignore tags to unknown nodes (issue2750)
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 23:50:28 +0100] rev 14498
bookmarks: do not forward merged bookmark (issue1877)
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Sat, 26 Mar 2011 13:05:17 +0100] rev 14497
rebase: restore mq guards after rebasing (issue2107)
Guards on rebased mq patches were lost.
This patch restores them after the qimporting step.
Bernhard Leiner <bleiner@gmail.com> [Wed, 16 Mar 2011 23:09:14 +0100] rev 14496
revset: report a parse error if a revset is not parsed completely (issue2654)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 25 May 2011 18:48:00 +0200] rev 14495
color: fix --color=always when output is piped
Also restructures the mode determination as discussed on IRC.
I tried to simplify the code too, while keeping the original
semantics except for the case of --color=always.
Martin Geisler <mg@lazybytes.net> [Wed, 01 Jun 2011 12:38:46 +0200] rev 14494
check-code: flag 0/1 used as constant Boolean expression
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 20:39:04 -0500] rev 14493
run-tests: allow whitelisting tests that should always run
It's desirable to run some tests all the time, for example
test-check-pyflakes.t and test-check-code-hg.py. This allows passing
--whitelist as a path to a file (flag can be specified more than once)
which contains a list of files to whitelist. Whitelisted tests are run
even if they're blacklisted or wouldn't match a --keyword test
run. For example, to do a quick test of usehttp2, one can now do
$ cat > test-whitelist <<EOF
> test-check-pyflakes.t
> test-check-code-hg.py
> EOF
$ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true'
> -k http -j 8 --whitelist test-whitelist)
and have all http-specific tests run as well as the two code linters.
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 19:49:17 -0500] rev 14492
subrepo: make stdin for svn a pipe for non-interactive use (issue2759)
This certainly can't hurt, so go ahead and do it, potentially along
with --non-interactive if that flag is safe for the given subcommand.
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 17:18:23 -0500] rev 14491
tests: glob version number in test-hgrc
Steven Brown <StevenGBrown@gmail.com> [Sat, 28 May 2011 14:44:45 +0800] rev 14490
web: provide diffstat to the changeset page
This includes all affected files, so it can be used for an extended view of
the files or as a replacement for the filenodelink and filenolink templates.
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 16:24:47 -0500] rev 14489
tests: update for handling of missing hgrc includes
Regis Desgroppes <regis.desgroppes@nokia.com> [Tue, 31 May 2011 16:22:04 -0500] rev 14488
subrepo: svn abort now depends on exit code (issue2833)
desgropp <regis.desgroppes@nokia.com> [Tue, 31 May 2011 12:41:22 +0200] rev 14487
fixed issue2833: aborts nows depends on svn exit code
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 16:00:39 -0500] rev 14486
config: ignore include errors for nonexistent files
Brendan Cully <brendan@kublai.com> [Tue, 31 May 2011 11:52:22 -0700] rev 14485
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:55:23 -0500] rev 14484
requires: note apparent corruption
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 May 2011 19:16:25 +0200] rev 14483
readrequires: provide easier to understand error message
NEW:
$ hg id
abort: unknown repository format: requires feature 'foo' (upgrade Mercurial)!
OLD:
$ hg id
abort: requirement 'foo' not supported!
Adrian Buehlmann <adrian@cadifra.com> [Tue, 31 May 2011 19:16:18 +0200] rev 14482
introduce new function scmutil.readrequires
for reading and parsing the .hg/requires file
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:28:23 -0500] rev 14481
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:26:02 -0500] rev 14480
merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 31 May 2011 15:25:43 -0500] rev 14479
merge with i18n
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 12:21:53 +0200] rev 14478
merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 12:21:08 +0200] rev 14477
merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 12:20:36 +0200] rev 14476
merge with hg-i18n
Martin Geisler <mg@lazybytes.net> [Mon, 30 May 2011 11:52:17 +0200] rev 14475
test-gendoc: update for new Russian translation
Alexander Sauta <demosito@gmail.com> [Mon, 30 May 2011 01:24:21 +0400] rev 14474
i18n-ru: branches-import translated
Alexander Sauta <demosito@gmail.com> [Sun, 29 May 2011 02:33:36 +0400] rev 14473
i18n-ru:bisect,backout,branch translated
Alexander Sauta <demosito@gmail.com> [Sun, 29 May 2011 01:42:59 +0400] rev 14472
i18n-ru: translated add, addremove, annotate, archive
Alexander Sauta <demosito@gmail.com> [Sun, 29 May 2011 01:31:12 +0400] rev 14471
i18n-ru:translation started,convert translated