Augie Fackler <durin42@gmail.com> [Mon, 18 Jul 2011 07:53:26 -0500] rev 14906
summary: show bookmarks separate from tags and note active mark (issue2892)
Andrew Pritchard <andrewp@fogcreek.com> [Wed, 20 Jul 2011 18:23:06 -0400] rev 14905
localrepo: make requirements attribute of newly-created repos contain a set
This is for internal consistency, as this attribute typically contains a set
Matt Mackall <mpm@selenic.com> [Fri, 22 Jul 2011 16:46:22 -0500] rev 14904
localrepo: fix comment on set
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 15:39:37 -0500] rev 14903
revert: restore check for uncommitted merge (issue2915) (BC)
This will restore the pre-1.9 behavior.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:06:55 -0500] rev 14902
localrepo: add set method to iterate over a given revset
This should allow replacing a number of hand-rolled graph algorithms.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:05:45 -0500] rev 14901
revset: add formatspec convenience query builder
Matt Mackall <mpm@selenic.com> [Thu, 21 Jul 2011 14:04:57 -0500] rev 14900
revset: allow bypassing alias expansion
For internal usage of revset queries, we don't want aliases breaking things.
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 17:51:45 -0500] rev 14899
merge with stable
Kevin Bullock <kbullock@ringworld.org> [Tue, 19 Jul 2011 13:43:53 -0500] rev 14898
subrepo: don't commit in subrepo if it's clean
If a subrepo has changed relative to the outer repo's substate, but the
subrepo itself is clean, we don't need to commit in the subrepo.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Mon, 18 Jul 2011 22:58:21 +0200] rev 14897
rebase: block collapse with keepbranches on multiple named branches (issue2112)
Collapse and keepbranches should be blocked when there is more than
one named branch on the branch that's going to be rebased.
Matt Mackall <mpm@selenic.com> [Tue, 19 Jul 2011 14:19:04 -0500] rev 14896
merge with stable
Alexander Krauss <krauss@in.tum.de> [Sun, 17 Jul 2011 00:36:43 +0200] rev 14895
hbisect: do not assume that min(good) is an ancestor of min(bad)
The included test used to report "inconsistent state", which is
incorrect. While this situation cannot occur when the user sticks to
the suggested bisect sequence. However, adding more consistent
good/bad information to the bisect state should be tolerated as well.
Alexander Krauss <krauss@in.tum.de> [Sun, 17 Jul 2011 00:35:31 +0200] rev 14894
hbisect: more consistent variable name
Alexander Krauss <krauss@in.tum.de> [Sat, 16 Jul 2011 12:22:40 +0200] rev 14893
hbisect: confine loop to the relevant interval
In this context we know that ancestors[rev] == None for all rev <= goodrev,
so looping further back is unnecessary (and confusing).
Idan Kamara <idankk86@gmail.com> [Sat, 16 Jul 2011 15:24:28 +0300] rev 14892
win32: assign winstdout to sys.__stdout__ as well (issue2888)
On Windows sys.stdout was being replaced with winstdout, which caused
util.system() to redirect its output (due to 406b6d7bdcb9). That causes
interactive tools (such as vim) to stop working.
Matt Mackall <mpm@selenic.com> [Mon, 18 Jul 2011 14:57:22 -0500] rev 14891
alias: note interaction of shell aliases with early opts in help
Matt Mackall <mpm@selenic.com> [Mon, 18 Jul 2011 14:53:52 -0500] rev 14890
alias: fix up test results
Idan Kamara <idankk86@gmail.com> [Sat, 09 Jul 2011 19:06:59 +0300] rev 14889
hooks: redirect stdout/err/in to the ui descriptors when calling python hooks
We need to make sure that python hooks I/O goes through the ui descriptors so
it doesn't mess the command server protocol.
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 18:03:37 -0500] rev 14888
alias: pass local ui to shell alias
This avoids an additional config read
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 16:06:54 -0500] rev 14887
aliases: drop cwd manipulation
Already done in _dispatch
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 16:06:53 -0500] rev 14886
dispatch: move shell alias handling after early arg handling
--cwd, --repo, and --config obviously should be handled first
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 14:27:16 -0500] rev 14885
merge with stable
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Fri, 15 Jul 2011 20:07:19 +0200] rev 14884
rebase: reset bookmarks (issue2265 and issue2873)
Matt Mackall <mpm@selenic.com> [Fri, 15 Jul 2011 12:56:58 -0500] rev 14883
merge with stable
Idan Kamara <idankk86@gmail.com> [Thu, 14 Jul 2011 11:46:15 +0300] rev 14882
cmdserver: take repo.baseui as our ui
The ui passed to server() is really repo.ui, that is it contains its local
configuration as well.
When running commands that use a different repo than the servers cached repo,
we don't want to use that ui as the baseui for the new repo.
Benoit Allard <benoit@aeteurope.nl> [Fri, 15 Jul 2011 10:18:24 +0200] rev 14881
web: Output a correct date in short format (issue2902)
Idan Kamara <idankk86@gmail.com> [Fri, 15 Jul 2011 16:28:09 +0300] rev 14880
test-commandserver: explicitly close opened file
Matt Mackall <mpm@selenic.com> [Thu, 14 Jul 2011 12:39:39 -0500] rev 14879
verify: fix mq misfire
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:30:27 -0500] rev 14878
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:30:09 -0500] rev 14877
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 05 Jul 2011 17:54:36 -0300] rev 14876
i18n-pt_BR: synchronized with 35f5cfdd0427
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:27:56 -0500] rev 14875
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:43:18 -0500] rev 14874
commit: suppress spurious new head message for duplicate commit (issue2893)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:58:51 -0500] rev 14873
osutil: emulate os.listdir's OSError for long names (issue2898)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:28:46 -0500] rev 14872
verify: filter messages about missing null manifests (issue2900)
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 19:24:54 -0500] rev 14871
merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 17:41:49 -0500] rev 14870
subrepo: use working copy of .hgsub to filter status (issue2901)
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:33 +0200] rev 14869
notify: remove unused url() method
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:12 +0200] rev 14868
test-notify-changegroup: test notifications on unbundle
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:08 +0200] rev 14867
run-tests: fix summary when accepting changes interactively
Accepted changes were not counted as success.
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:29:28 -0500] rev 14866
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 13 Jul 2011 16:28:46 -0500] rev 14865
verify: filter messages about missing null manifests (issue2900)
Idan Kamara <idankk86@gmail.com> [Mon, 11 Jul 2011 17:49:45 +0300] rev 14864
cmdserver: restore old working dir after dispatch when we have --cwd
Idan Kamara <idankk86@gmail.com> [Mon, 11 Jul 2011 17:46:55 +0300] rev 14863
dispatch: don't use request repo if we have --cwd
Nicholas Riley <njriley@illinois.edu> [Tue, 12 Jul 2011 12:06:11 -0400] rev 14862
eol: ignore IOError from deleted files in commitctx
A Mercurial repo signals a file is deleted by raising IOError when the
file's data is requested. This IOError is normally caught by
localrepository.commitctx. With the eol extension enabled and EOL
mappings in place, the eolrepo subclass should ignore IOError because
a deleted file has no line endings to process.
This issue exhibited itself when performing an incremental hg convert
of a revision with deleted files to a repo with an existing .hgeol
file.
Steve Borho <steve@borho.org> [Fri, 08 Jul 2011 20:24:19 -0500] rev 14861
scmutil: add missing import of re
see https://bitbucket.org/tortoisehg/thg/issue/929
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:36:34 -0500] rev 14860
dispatch: fix checking of rpath in _getlocal
This avoids an extra config read
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:36:22 -0500] rev 14859
ui: rename _is_trusted to _trusted
is and do are pointless, underbar separators are style violations
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:27:03 -0500] rev 14858
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 16:22:36 -0500] rev 14857
eol: fix silly test-gendoc breakage by escaping control characters
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 12:13:07 +0200] rev 14856
eol: document new eol.fix-trailing-newline setting
Stepan Koltsov <stepancheg@yandex-team.ru> [Fri, 01 Jul 2011 23:12:52 +0400] rev 14855
eol: fix missing trailing newlines in comitted files
Some text editors (Eclipse, for example) do not add trailing newlines,
so diffs often contain annoying "\ No newline at the end of file".
This patch to eol extension simply adds trailing newline on commit.
Stepan Koltsov <stepancheg@yandex-team.ru> [Fri, 01 Jul 2011 22:53:58 +0400] rev 14854
eol: eol.only-consistent can now be specified in .hgeol
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:34:19 +0200] rev 14853
merge with stable
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:19:37 +0200] rev 14852
commands: use mergetoolopts when a command supports --tool
Matt Mackall <mpm@selenic.com> [Tue, 12 Jul 2011 12:35:03 -0500] rev 14851
revsets: actually catch type error on tip^p1(tip) (issue2884)
The previous commit was empty.
Cédric Krier <ced@b2ck.com> [Sat, 09 Jul 2011 09:44:15 +0200] rev 14850
hgcia: Set default value of strip to -1 (issue2891)
For backward compatibility the root path of the repository is not
displayed unless the user has specified an explicit strip value.
Martin Geisler <mg@aragost.com> [Thu, 07 Jul 2011 10:32:30 +0200] rev 14849
commands: improve help for -y/--noninteractive
Before, the help text said that Mercurial would assume 'yes' for all
prompts, but this is confusing since many prompts don't have any 'yes'
choice. It now more accurately describes what will happen.
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:56 -0500] rev 14848
bookmarks: simplify warning code
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:56 -0500] rev 14847
bookmarks: drop superfluous strip
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 05 Jul 2011 10:20:27 +0200] rev 14846
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 05 Jul 2011 10:13:54 +0200] rev 14845
bookmarks: more robust parsing of bookmarks file
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 19:25:53 -0500] rev 14844
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 13:43:29 -0500] rev 14843
revsets: catch type error on tip^p1(tip) (issue2884)
Matt Mackall <mpm@selenic.com> [Wed, 06 Jul 2011 13:37:50 -0500] rev 14842
revsets: do the right thing with x^:y (issue2884)
Given an operator ^ that's either postfix or infix and an operator :
that's either prefix or infix, the parser can't figure out the right
thing to do. So we rewrite the expression to be sensible in the optimizer.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 06 Jul 2011 18:28:42 +0900] rev 14841
win32mbcs: wrap two more functions to be wrapped.
util.checkwinfilename() and util.checkosfilename() are wrapped.
The former, used by scmutil, is not friendly for Shift_JIS bytes.
The latter is an dynamic alias of checkwinfilename() used by other
modules.
Idan Kamara <idankk86@gmail.com> [Tue, 05 Jul 2011 14:36:33 +0300] rev 14840
commands, merge: call setconfig on the right ui
In practice this doesn't change anything since ui == repo.ui here, but setting
repo.ui explicitly here is clearer since hg.merge will use repo.ui later on.
Idan Kamara <idankk86@gmail.com> [Tue, 05 Jul 2011 14:28:55 +0300] rev 14839
peer: change arg name to convey it can be a repo as well
Augie Fackler <durin42@gmail.com> [Thu, 23 Jun 2011 15:00:45 -0500] rev 14838
progress: add a changedelay to prevent parallel topics from flapping (issue2698)
When combined with the earlier change to make the progress object
truly a singleton, this prevents the progress bar swapping on 'hg
clone --pull' on a local filesystem.
Thanks to timeless for lots of debugging help at the Copenhagen sprint
to isolate the root cause of this and a first draft an idea that would
fix it.
Augie Fackler <durin42@gmail.com> [Thu, 23 Jun 2011 14:55:09 -0500] rev 14837
progress: make progress bar a singleton to avoid double-progress ui bugs
This helps issue2698 a little, but isn't a complete fix, since
generators still can produce some weird progress bar switching.
Augie Fackler <durin42@gmail.com> [Thu, 02 Jun 2011 14:33:01 -0500] rev 14836
progress: remove superfluous parens
Christian Ebert <blacktrash@gmx.net> [Sun, 03 Jul 2011 12:58:03 +0200] rev 14835
keyword: reuse already present working contexts for match
Shortens overlong line as side-effect.
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:53 -0500] rev 14834
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:42 -0500] rev 14833
discovery: quiet note about heads
This was changing output on in/out -v for no good reason.
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 04 Jul 2011 19:53:39 -0300] rev 14832
patch: fix parsing patch files containing CRs not followed by LFs
Since 1e64e1e12195 , patch lines containing a CR not followed by a LF
would be incorrectly splitten, causing a failure to apply the patch.
Jim Hague <jim.hague@acm.org> [Tue, 05 Jul 2011 11:53:32 +0100] rev 14831
treediscovery: rename stop() in tests to fix failures on AIX.
It seems ksh, the default shell on AIX, does not permit the creation of a
function called stop(). test-treediscovery.t and test-treediscovery-legacy.t
both fail on AIX with error 'syntax error at line 25 : `(' unexpected'.
Fix by renaming stop() in the scripts to tstop(). For completeness
rename start() to tstart() to match. Both tests then pass on AIX.
Add check for the use of stop() in a shell script to check-code.
Idan Kamara <idankk86@gmail.com> [Mon, 04 Jul 2011 14:36:16 +0300] rev 14830
fileset: fix typo in binary() doc
Arne Babenhauserheide <bab@draketo.de> [Fri, 01 Jul 2011 22:50:36 +0200] rev 14829
help: fileset foo.lst was named files.lst
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:59:09 -0500] rev 14828
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:27 -0500] rev 14827
Added signature for changeset de9eb6b1da4f
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:25 -0500] rev 14826
Added tag 1.9 for changeset de9eb6b1da4f
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jul 2011 17:37:09 +0200] rev 14825
util: rename the util.localpath that uses url to urllocalpath (issue2875)
util is never imported by any other name than util, so this is mostly just a
simple search and replace from util.localpath to util.urllocalpath (assuming
other uses of util.localpath already has been renamed).
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jul 2011 18:13:48 +0200] rev 14824
tests: restore previous fix for date ambiguity in cvs test
017ab404e588 changed some sleeps after cvs update to sleeps before commit. I
don't know why that should work, but I have a machine where it doesn't work.
Commits regularly fails becuase cvs doesn't notice that a file has been
changed.
Restoring the previous sleep between the update and the edit makes cvs notice
the change.
Matt Mackall <mpm@selenic.com> [Thu, 30 Jun 2011 19:34:09 -0500] rev 14823
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:36:38 +0200] rev 14822
run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:25:05 +0200] rev 14821
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
Eli Carter <eli.carter@tektronix.com> [Thu, 30 Jun 2011 13:22:12 -0500] rev 14820
subrepo: correct revision in svn checkout
A Subversion subrepo checkout uses a url and --revision which does not do the
correct thing when specifying a revision of a branch that has since been
deleted and recreated. The checkout needs to specify the revision as URL@REV
instead.
Steve Borho <steve@borho.org> [Thu, 30 Jun 2011 12:55:19 -0500] rev 14819
wix: catch up with more added files
revsets: 1.7::tip and adds("mercurial/help/**")
1.7::tip and adds("mercurial/templates/**")
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Jun 2011 20:37:32 -0300] rev 14818
i18n-pt_BR: translate template filter descriptions
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Jun 2011 20:05:23 -0300] rev 14817
i18n-ja: recover template translations from 15200b46165b
These translations were removed by 68a697421a57 because the original
strings were transfered to the docstrings (264f292a0c6f) without
the corresponding sources being added to the Makefile for extraction.
Alexander Sauta <demosito@gmail.com> [Fri, 01 Jul 2011 00:26:45 +0400] rev 14816
i18n-ru: fixed mixed up msgid and msgstr in annotate
Alexander Sauta <demosito@gmail.com> [Fri, 01 Jul 2011 00:14:30 +0400] rev 14815
i18n-ru: translated missing strings for commands, some typos corrected
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 29 Jun 2011 18:19:17 -0300] rev 14814
i18n-pt_BR: synchronized with 9adce4b38ed1
Matt Mackall <mpm@selenic.com> [Wed, 29 Jun 2011 16:05:59 -0500] rev 14813
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 29 Jun 2011 16:05:41 -0500] rev 14812
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 30 Jun 2011 01:55:14 +0900] rev 14811
i18n-ja: synchronized with 5c046e4b9652
Alexander Sauta <demosito@gmail.com> [Wed, 29 Jun 2011 19:04:03 +0400] rev 14810
i18n-ru: translated help for urls. Thus, all stock commands and help translated
Alexander Sauta <demosito@gmail.com> [Wed, 29 Jun 2011 16:14:26 +0400] rev 14809
i18n-ru: translated help for templating
Jens Bäckman <jens.backman@gmail.com> [Wed, 29 Jun 2011 09:24:45 +0200] rev 14808
i18n-sv: synchronized with 85857aa6e666
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 28 Jun 2011 14:32:54 -0300] rev 14807
i18n-pt_BR: synchronized with 6ba51c81ff75
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 20:42:07 +0400] rev 14806
i18n-ru: translated help for multirevs-subrepos
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 10:06:56 +0200] rev 14805
i18n-da: translate hg.1.html header
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 10:02:39 +0200] rev 14804
i18n: merge with stable
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 00:34:49 +0400] rev 14803
i18n-ru: translated help for merge-tools
Alexander Sauta <demosito@gmail.com> [Mon, 27 Jun 2011 21:34:48 +0400] rev 14802
i18n-ru: translated help for hgignore
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 09:58:39 +0200] rev 14801
i18n-pt_BR: add lost translation used in test-i18n.t
Changeset e6a6e7ebd585 replaced the Portuguese translation with the
English original and broke the test.
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 09:42:45 +0200] rev 14800
i18n: merge with main
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 09:39:58 +0200] rev 14799
i18n: merge with main
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 00:38:59 +0400] rev 14798
merge with stable
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 00:34:49 +0400] rev 14797
i18n-ru: translated help for merge-tools
Alexander Sauta <demosito@gmail.com> [Mon, 27 Jun 2011 21:34:48 +0400] rev 14796
i18n-ru: translated help for hgignore
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 15:12:41 -0300] rev 14795
i18n-pt_BR: synchronized with 72e4fcb43227
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 15:09:55 -0300] rev 14794
i18n-ru: drop executable bit from .po file
Martin Geisler <mg@lazybytes.net> [Mon, 27 Jun 2011 19:11:34 +0200] rev 14793
merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 27 Jun 2011 19:10:45 +0200] rev 14792
i18n: merge with main
This includes four i18n changesets transplanted from the default
branch to the stable branch since they were made after the freeze.
Alexander Sauta <demosito@gmail.com> [Thu, 23 Jun 2011 10:41:33 +0400] rev 14791
i18n-ru: glossary translated
Alexander Sauta <demosito@gmail.com> [Wed, 22 Jun 2011 02:47:03 +0400] rev 14790
i18n-ru: tranlated docstrings from filesets added in 1575dc5d399a
Alexander Sauta <demosito@gmail.com> [Wed, 22 Jun 2011 02:09:23 +0400] rev 14789
i18n-ru: translated help for extensions and filesets
Alexander Sauta <demosito@gmail.com> [Tue, 21 Jun 2011 01:49:45 +0400] rev 14788
i18n-ru: translated new config.txt
Martin Geisler <mg@lazybytes.net> [Mon, 27 Jun 2011 19:06:18 +0200] rev 14787
i18n: merge with main
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 13:50:31 -0300] rev 14786
i18n-pt_BR: synchronized with 94eea58da2a3
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 13:48:25 -0300] rev 14785
fileset: add i18n hints for keywords
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 13:24:28 -0300] rev 14784
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 13:24:01 -0300] rev 14783
merge with i18n
Jens Bäckman <jens@titv.se> [Thu, 23 Jun 2011 22:35:44 +0200] rev 14782
18n-sv: translated all new fuzzy strings
Alexander Sauta <demosito@gmail.com> [Thu, 23 Jun 2011 10:41:33 +0400] rev 14781
i18n-ru: glossary translated
Alexander Sauta <demosito@gmail.com> [Wed, 22 Jun 2011 02:47:03 +0400] rev 14780
i18n-ru: tranlated docstrings from filesets added in 1575dc5d399a
Alexander Sauta <demosito@gmail.com> [Wed, 22 Jun 2011 02:09:23 +0400] rev 14779
i18n-ru: translated help for extensions and filesets
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 21 Jun 2011 19:00:27 -0300] rev 14778
merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 20 Jun 2011 19:24:50 -0300] rev 14777
i18n-pt_BR: synchronized with 6c7283faa967
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 21 Jun 2011 18:37:15 -0300] rev 14776
merge with i18n
Alexander Sauta <demosito@gmail.com> [Tue, 21 Jun 2011 01:49:45 +0400] rev 14775
i18n-ru: translated new config.txt
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 20 Jun 2011 17:00:04 -0300] rev 14774
i18n-pt_BR: messages from crew f9c056f48018
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 20 Jun 2011 16:56:15 -0300] rev 14773
i18n-pt_BR: synchronized with 15200b46165b
Adrian Buehlmann <adrian@cadifra.com> [Wed, 29 Jun 2011 12:54:34 +0200] rev 14772
wix: add missing templates/paper/diffstat.tmpl
Jesse Long <jpl@unknown.za.net> [Wed, 29 Jun 2011 09:36:45 +0200] rev 14771
hgweb: treat branch attribute `closed' as more important than `inactive'
In the branches page, branches that are closed and are merged into another
branch are displayed as `inactive'. This patch changes that behaviour to
show these branches as `closed'.
For me, the `closed' attribute is more important than the `inactive'
attribute.
Branches that are not closed, and are merged into other branches will still
be shown as `inactive'.
Branches that are closed, and are not merged into other branches will still
be shown as `closed'.
Idan Kamara <idankk86@gmail.com> [Wed, 29 Jun 2011 15:49:35 +0300] rev 14770
tests: add basic commandserver test
Brodie Rao <brodie@bitheap.org> [Wed, 29 Jun 2011 13:20:40 -0400] rev 14769
color: for the sake of "less -R", default to ansi in auto mode (issue2792)
less with the -R option only supports ANSI color codes, and terminfo
mode issue non-ANSI color codes (depending on the database). The -r
option can work around this, but there are users currently using the
-R option, and defaulting to terminfo would break colorization in less
for them without warning.
Brodie Rao <brodie@bitheap.org> [Wed, 29 Jun 2011 13:20:39 -0400] rev 14768
color: fix TypeError with auto mode on win32 when colors aren't available (issue2871)
This can happen when stdout isn't a terminal (e.g., it's being piped).
Adrian Buehlmann <adrian@cadifra.com> [Tue, 28 Jun 2011 00:56:33 +0200] rev 14767
test-revert: add revert --all case when nothing changed
supposed to succeed without notice
Matt Mackall <mpm@selenic.com> [Wed, 29 Jun 2011 16:01:06 -0500] rev 14766
subrepos: be smarter about what's an absolute path (issue2808)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Jun 2011 13:04:00 +0200] rev 14765
test-wireprotocol.py: rename to test-wireproto.py for consistency
1. The module named 'wireproto' is tested.
2. There already is a test-wireproto.t for related tests on shell level.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Jun 2011 15:00:00 +0200] rev 14764
classes: fix class style problems found by b071cd58af50
This makes test-wireprotocol.py work on Python 2.4
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Jun 2011 13:45:51 +0200] rev 14763
check-code: fix class style checking (with tests)
- old-style classes were only checked for one-letter class names
- add check for new-style classes with empty parent class, because
this is not available in Python 2.4
Mads Kiilerich <mads@kiilerich.com> [Wed, 29 Jun 2011 00:19:27 +0200] rev 14762
tests: ignore inotify extension in test-duplicateoptions.py
The inotify extension is only available on linux and setup.py will not install
it on other platforms - but it will of course always be there in the source.
test-duplicateoptions.py tried to load most extensions (including inotify if
available). When the local uninstalled Mercurial was used it would thus always
load the inotify extension and cause a warning on unsupported platforms.
The inotify extension is not relevant for this test, so now we explicitly
ignore it.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 25 Jun 2011 02:30:17 +0200] rev 14761
error: Add a hint argument to RepoError
This use the same mechanism than Abort. Except clause stay distinct
because RepoError add "!" at the end of the message.
Adrian Buehlmann <adrian@cadifra.com> [Tue, 28 Jun 2011 00:56:33 +0200] rev 14760
test-revert: add revert --all case when nothing changed
supposed to succeed without notice
Matt Mackall <mpm@selenic.com> [Mon, 27 Jun 2011 16:39:02 -0500] rev 14759
merge with stable
Danek Duvall <duvall@comfychair.org> [Mon, 27 Jun 2011 11:36:42 -0700] rev 14758
color: be silent when falling back to ECMA-48 mode if "auto" mode was desired
Don't warn about missing setab/setaf terminfo entries unless we explicitly
asked for terminfo mode; fallback to ECMA-48 mode silently.
Danek Duvall <duvall@comfychair.org> [Mon, 27 Jun 2011 11:36:40 -0700] rev 14757
tests: hardcode terminfo entry for the terminfo color test
For the terminfo color test, make sure that the terminfo entry used is one
of our own choosing, by delivering a special "hgterm" entry (a copy of
ncurses' xterm-color), compiling it, and specifically pointing curses to it
using the TERMINFO and TERM environment variables. This means we can
ignore the variability in different terminal definitions on different
platforms.
Wagner Bruna <wbruna@yahoo.com> [Sun, 26 Jun 2011 15:47:39 -0300] rev 14756
localrepo: mark progress step for translation
Adrian Buehlmann <adrian@cadifra.com> [Sun, 26 Jun 2011 01:13:30 +0200] rev 14755
revert: improve hints on abort when reverting to parent without --all
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
Uncommitted changes (using --all *will* nuke edits):
$ hg revert
abort: no files or directories specified
(uncommitted changes, use --all to discard all changes)
Clean working directory (using --all won't discard anything):
$ hg revert
abort: no files or directories specified
(use --all to revert all files)
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:44:59 +0300] rev 14754
dispatch: set config options on the request repo.ui
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:44:59 +0300] rev 14753
dispatch: return read config options
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:44:58 +0300] rev 14752
dispatch: set global options on the request repo.ui
If the request has a repo, and global options such as --verbose are passed,
we need to set those explicitly on the repo.ui.
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:44:17 +0300] rev 14751
cmdserver: assign repo.baseui before running commands
There are places in the code that use localrepository.baseui (see hg.remoteui),
we need the ui descriptors (and possibly other things) to be set
correctly on it, so output written to the remoteui descriptors ends up at the
right place.
Before this change, tests such as 'test-bookmarks-pushpull.t' didn't work.
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 19:43:59 +0300] rev 14750
cmdserver: copy repo.ui before running commands
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()