Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 17:04:37 +0300] rev 14749
filemerge: use ui out descriptor when calling util.system
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 12:16:14 +0300] rev 14748
dispatch: make sure unspecified global ui options don't override old values
Matt Mackall <mpm@selenic.com> [Mon, 27 Jun 2011 11:19:27 -0500] rev 14747
merge with stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 25 Jun 2011 02:30:24 +0200] rev 14746
requirements: show all missing features in the error message.
Displaying all missing featureis help people to solve the issue (choosing the
right version, creation the right repo)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 23:29:51 +0200] rev 14745
test-revert: add case for nothing changed
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:38:28 +0300] rev 14744
dispatch: set descriptors on the request repo.ui
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:36:44 +0300] rev 14743
dispatch: pass the correct ui to runcommand
For commands that take a repo, repo.ui is passed as the ui to runcommand.
This restores that behaviour when the request has a repo.
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 17:04:37 +0300] rev 14742
archive: wrap the ui descriptor so it doesn't get closed
archival.tarit closes the fileobj if one is passed to it, which is undesired
when reading from '-'.
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:27:53 +0300] rev 14741
transplant: use ui out descriptor when calling util.system
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 17:04:37 +0300] rev 14740
bisect: use ui out descriptor when calling util.system
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 17:04:37 +0300] rev 14739
extdiff: use ui out descriptor when calling util.system
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 17:04:37 +0300] rev 14738
ui: use ui out descriptor when calling util.system
David Golub [Fri, 24 Jun 2011 11:39:12 -0400] rev 14737
call reposetup for repositories returned from peer (issue2864)
Extension setup functions were not being called when repositories were
obtained using the peer function instead of the repository function.
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jun 2011 01:55:16 +0200] rev 14736
tests: solaris [ doesn't know -e
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jun 2011 01:55:15 +0200] rev 14735
convert: fix git convert on solaris - it cannot remove environment variables
Mads Kiilerich <mads@kiilerich.com> [Sat, 25 Jun 2011 01:55:13 +0200] rev 14734
tests: HGRCPATH must be exported after assignment
- at least on Solaris
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 18:00:29 -0500] rev 14733
merge with stable
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 23:25:42 +0300] rev 14732
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:44 -0500] rev 14731
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:03 -0500] rev 14730
merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 24 Jun 2011 10:31:44 +0200] rev 14729
update: do not use the term 'update' when mentioning reverting one file
and give a more precise hint for how to revert such a file
I'm using the term 'revision' instead of 'changeset' in this change to be
consistent with the REV we use in the synopsis.
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 16:36:24 +0300] rev 14728
cmdserver: fix read-loop string concatenation
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 16:30:43 +0300] rev 14727
dispatch: check for None before closing repo
We were trying to call close() if repo == None and req.repo != None.
This can happen when running commands that don't take a repo.
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.