test-import: use printf instead of echo

import: --no-commit should update .hg/last-message.txt The patch parser goes through all of that trouble extracting the commit message from the patch file. It seems such a waste not to use it.

merge with stable after 1.7 release

Added signature for changeset 333421b9e0f9

Added tag 1.7 for changeset 333421b9e0f9

merge with i18n

i18n-pt_BR: synchronized with b19b4c1df066

dirstate: skip optimization on case-folding FS (issue2440)

url: fix https client authentication through proxy There is no tests for this, but the parameter order was obviously wrong.

merge with i18n

i18n-sv: synchronize with 13fb555677fe

i18n-zh_TW: synchronize with 15ca4bfecfe3

i18n-ja: strip extra spaces next to punctuation mark at line ending

i18n-pt_BR: synchronized with 15ca4bfecfe3

commit: handle missing newline on last commit comment

localrepo: do not modify ctx.remove() list in-place

test-rename: test with absolute paths

test-rename: fix \" -> " in comments

rebase: improve resolve failure message

run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ...

demandimport: back out 50a4e55aa278 (issue2467)

debugindex: add --format flag to allow debugging parentdelta -f 1 shows extra data from revlogv1 (aka revlogng) including flags and size (based on a patch by Pradeepkumar Gayam <in3xes@gmail.com>)

pager: make example of setting pager less silly

convert: Work around p4 instability (issue2465) The p4 command-line client sometimes fails upon doing "p4 describe" when trying to produce a patch. (I'm guessing it's a bug in p4.) However, "hg convert" doesn't even make use of the patch, and it can be elided by adding "-s" to the p4 command line here.

revlog: choose best delta for parentdelta (issue2466) When parentdelta is enabled, we choose the delta that has the minimum distance to its base. Otherwise, base may be sufficiently far away to require a full version, resulting in greatly reduced compression.

revlog: precalculate p1 and p2 revisions

revlog: extract delta building to a subfunction

revlog: simplify cachedelta handling

revlog: fix buildtext local scope buildtext stores its result in _addrevision scope to avoid repeated builds cachedelta is already visible

merge with i18n

i18n-ja: synchronized with 6f6f6a9c2a41

i18n-pt_BR: synchronized with db2ff771204d Reviewed formatting fixes from eda77c3e246a.

i18n-da: translate help for bookmarks extension

i18n, bookmarks: add comments for translators

i18n-da: synchronize with e1855dee28c1

qnew: distinguish between existing file and directory (issue2464)

qnew: give better feedback when doing 'hg qnew foo/' (issue2464)

opener: do not create "foo" directory when writing to "foo/" The directories were not cleaned up when the subsequent open failed and this would confuse things like qnew.

pager: backout 05077896ffe2 (issue2441)

mq: qrename should not touch the dirstate if src is untracked (issue2460)

patch: fix copies when patching over uncommitted changed (issue2459)

merge with i18n

i18n-pt_BR: synchronized with 830be2c57626

i18n-pt_BR: msgmerge with 830be2c57626

merge with i18n

i18n-da: remove extra newline in translation

i18n-da: synchronize with 6137c5bba4d0

minirst: use colwidth to match title lengths (issue2455)

encoding: default ambiguous character to narrow The current implementation of colwidth was treating 'A'mbiguous characters as wide, which was incorrect in a non-East Asian context. As per http://unicode.org/reports/tr11/#Recommendations, we should instead default to 'narrow' if we don't know better. As character width is dependent on the particular font used and we have no idea what fonts are in use, this recommendation applies. This introduces HGENCODINGAMBIGUOUS to get the old behavior back.

*: kill all unnecessary shebangs.

*: add executable bit to a few files that were missing it.

log: do case insensitive search for --user option

url: show realm/user when asking for username/password

rebase: abort message should appear even with --quiet

help: correct tip about deleting a subrepository The extra detail is not necessary, and wrong for Mercurial subrepositories, so remove it (suggested by Patrick Mézard).

revset: fix missing dot in docstring

help: fix typo in merge-tools topic

README: add small introduction

README: remove trailing blank line

i18n: translate revset predicate docstrings

i18n: extract docstrings from revset module

test-win32text.t: stabilize test output The test sometimes failed because f4.bat wasn't dirty. I'm not sure whether it should or shouldn't be dirty, but the extension is broken and deprecated and we just want to see the deprecation warning, so now we just avoid showing the dirtyness.

subrepo: propagate non-default pull/push path to relative subrepos (issue1852)

bookmarks: improve English for diffbookmarks