Merge with stable

mq: qpop now tells which patches are popped When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output. [ original upstream message ]

Merge with stable

(0.9.2compat) empty string as default value for hgcmd

(0.9.2compat) use all caps NOTE: in help string

keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'. [ original upstream message ]

(0.9.2compat) prefer self.func over repo.func in kwrepo Avoid nesting by falling back on parent class member function.

(stable) merge

Eliminate potential reference cycles from kwrepo - delete kwrepo.commitctx after using the tweaked version - prefer self.hook over repo.hook to avoid nesting Also pass arguments to commit as arbitrary list. Thanks to Simon Heimberg and Matt Mackall for guidance.

(0.9.2compat) kwdemo: get rid of subfunction and ease translation

Collect kwmaps using a generator expression Allowed for Python 2.4.

Merge with stable

(0.9.2compat) warp docstrings at 78 chars

keyword: wrapped docstrings at 78 characters [ original upstream description ]

(stable) merge

Remove unused import

(stable) merge

Break overlong line

(stable) merge

Make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.

(stable) merge

(0.9.2compat) lowercase status flags of untracked files in kwfile output Improve help as well, like in default branch.

Improve help for kwfiles - just use "files" instead of "filenames" (analogous to "hg status -h") - reference the extension help wrt pattern configuration Kudos to timeless for helpful suggestions.

Lowercase status flags of untracked files in kwfile output Document the flags and their meanings in the command help (thanks to timeless for bringing this to my attention).

Merge with stable

(0.9.2compat) improve help for kwfiles

keyword: improve help for kwfiles

Improve help for kwfiles

(stable) merge

Make kwdemo more translation friendly

(0.9.2compat) update synopsis

Merge with stable

extensions: change descriptions for hook-providing extensions Thanks to timeless and Dave Townsend for advice! [ original upstream message ]

extensions: fix up description lines some more [ original upstream message ]

Merge with stable

extensions: improve the consistency of synopses Trying as much as possible to consistently: - use a present tense predicate followed by a direct object - verb referring directly to the functionality provided (ie. not "add command that does this" but simple "do that") - keep simple and to the point, leaving details for the long help (width is tight, possibly even more so for translations) Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom Podlaski Christiansen and others for the helpful suggestions. [ original upstream message ]

Merge with stable

help: remove per-extension paragraph on how to enable it The central place to find this information is the "extensions" help topic. [ original upstream message ]

(0.9.2compat) concise help title

(stable) merge

Concise help title

Merge with stable

Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result. [ original upstream message ]

Merge with stable

(0.9.2compat) update doc strings and help

(0.9.2compat) improve English; from stable

keyword: improve English [ original upstream message ]

Merge with stable

merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right? [ original upstream message ]

(stable) merge

Remove doc string for standalone version default and stable branches only for development and history.

Merge with stable

tests: fix doc string in get-with-headers.py [ original upstream message ]

test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here. [ original upstream message ]

(stable) merge for run-tests.py

Merge with stable

(stable) fix import gone wrong in 43d8c042ca20

Add run-tests.py from main and update README

Refer users to distribution or 0.9.2compat branch

(0.9.2compat) document Mercurial version range for standalone extension