mq: be more explicit on invalid patch name message

fix broken tests test-debugcomplete.t broken by 58e58406ed19 test-highlight.t broken by b24e5a708fad

merge with stable

mq: add '.' and '..' to list of forbidden patch names When an empty string is being passed to normname it would return '.' causing checkfile() to always return that a patch with that name exists.

subrepo: handle svn tracked/unknown directory collisions This happens more often than expected. Say you have an svn subrepository with python code. Python would have generated unknown .pyc files. Now, you rebase this setup on a revision where a directory containing python code does not exist. Subversion is first asked to remove this directory when updating, but will not because it contains untracked items. Then it will have to bring back the directory after the merge but will fail because it now collides with an untracked directory. Using --force is not very elegant and only works with svn >= 1.5 but the only alternative I can think of is to write our own purge command for subversion.

subrepo: backout bcc6ed0f6c3b

wireproto: add test for new optional arg missing on server New argument is silently ignored by both HTTP and SSH servers. This means we can, for instance, add new flags to getbundle() to request advanced features (like lightweight-copy-aware bundles), and older servers will silently ignore this request and send back a plain bundle.

merge with stable

web: Made elapsed time calculation dynamic (javascript). This allow safe caching of the pages by the browser and still display the right amount of elapsed time upon page refresh. If javascript is disabled, absolute time is displayed, leaving it readable. All the templates have been updated.

extdiff: add repository root as a variable Some external diff tools (notably Plan 9 diff(1)) require the absolute path to the file being diffed for proper function. A root variable was added to inform an external tool of the repository root (the tool is invoked with the cwd set to tmproot).

help: move hgignore man page into built-in help (issue2769)

graphlog: make use of graphmod's revset support

graphmod: use revsets internally Thanks for the idea and most of the implementation to Klaus Koch Backs revisions() and filerevs() with DAG walker which can iterate through arbitrary list of revisions instead of strict one by one iteration from start to stop. When a gap occurs in a revisions (i.e. in file log), the next topological parent within the revset is searched and the connection to it is printed in the ascii graph. File graph can draw sometimes more connections than previous version, because graph is produced according to the revset, not according to a file's filelog. In case the graph contains several branches where the left parent is null, the graphs for each are printed sequentially, not in parallel as it was a case earlier (see for example the graph for README in hg-dev).

svn subrepo: attempt work around obstructed checkouts (issue2752) It should be possible to do better than this with 'svn switch', but the logic required woud be significantly more complex. Until someone needs the performance improvements of using switch, we'll just use the same strategy for everything.

churn: strip key earlier to avoid false negative seach in aliases

bookmarks: further restrict IOError on write This won't risk losing the undo file when the error was something other than file not found

tags: loosen IOError filtering when reading localtags

run-tests: don't count test as succeeded if it failed regressed around ec4ae5727f07

changegroup: do not count closed new heads (issue2697) If a closed head gets pulled, we currently see (example): $ hg pull pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) A subsequent 'hg heads' doesn't show that head because it is closed. This patch improves the UI response texts for that same use case to: $ hg pull pulling from $TESTTMP/repo2 searching for changes adding changesets adding manifests adding file changes added 2 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) That is, the part "(+1 heads)" is not shown in that case any longer.

merge with crew

shrink-revlog: defend against null first parents

test-contrib: add a test for shrink-revlog We only verify the extension runs and that verify passes at the end as constructing a test repository that would result in a shrink would be nontrivial.

test-simplemerge-cmd.t: move all tests into test-contrib.t

Move test-dumprevlog to test-contrib in anticipation of more contrib tests

shrink-revlog: use a bundler object (see d69c9510d648)

shrink-revlog: update util.opener to scmutil.opener after d13913355390

shrink-revlog: remove \ from docstring

bookmarks: be more restrictive in our Exception catching