(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

Merge with stable

resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer [ original upstream message ]

Merge with stable

commit: drop the now-unused files parameter [ original upstream message ]

Merge with stable

fixed typos found in translatable strings This is from a spell-check of hg.pot. [ original upstream message ]

(stable) merge with default

keyword: rename matcher() to match() mimicking changes in main

Merge with stable

match: add some default args [ original upstream message ]

match: change all users of util.matcher to match.match [ original upstream message ]

Merge with stable

update --clean: do not unlink added files (issue575) [ original upstream message ]

Merge with stable

commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories) [ original upstream message ]

Merge with stable

commit: move commit editor to cmdutil, pass as function [ original upstream message ]

commit: drop unused p1 and p2 args [ original upstream message ]

Merge with stable

updated license to be explicit about GPL version 2 [ original upstream message ]

Merge with stable

replace util.sort with sorted built-in This is marginally faster for small and moderately-sized lists [ original upstream message ]

Merge with stable

tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default. [ original upstream message ]

Merge with stable

switch lock releasing in the extensions from gc to explicit [ original upstream message ]

Merge with stable

keyword: set overwrite message only once, not for each file [ original upstream message ]

keyword, i18n: avoid untranslated strings as message parameters [ original upstream message ]

Merge with stable

expand "repo" to "repository" in help texts [ original upstream message ]

Merge with stable

keyword: word-wrap help texts at 70 characters [ original upstream description ]

Merge with stable

bundlerepo: reintroduce dirstate [ original upstream description ]

Merge with stable

add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension. [ original upstream descrition]

patch: pass an opener to patchfile [ original upstream description ]

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533. [ original upstream description ]

mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot. [ original upstream description ]

(0.9.2compat) do not use builtin format

(stable) merge with default

keyword: simplify repo.local and bundle check (as in 2f4a399a8787)

Merge with stable

get-with-headers: fix stream modes under Windows [ original upstream descripton ]

hgweb: return meaningful HTTP status codes instead of nonsense [ original upstream description ]

Add a test for getting raw files via the web UI. [ original upstream description ]

hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it. [ original upstream description ]

notify: mime-encode messages - addresses will be properly encoded - message bodies will also be encoded as we are not sending patches that are meant to be applied - update test output - adapt test-keyword to ignore the new headers [ original upstream description ]

(stable) merge with default

Do not shadow builtin format (detected by pychecker)

(stable) merge with default

keyword: move common code out of commit condition

Merge with stable

keyword: be more efficient about ctx usage [ original uptstream description ]

cmdutil: use change contexts for cset-printer and cset-templater [ original uptstream description ]

Merge with stable

patch: turn patch.diff() into a generator This should even be a little faster than passing in an fp argument. [ original upstream description ]

Merge with stable

extensions: use new wrapper functions [ original upstream description]

Merge with stable

help: better documentation intro for a few extensions [ original upstream description ]

show enabled extensions in hg help [ original upstream description ]

untest

cross them fingahs

Merge with stable

fix test output broken by a04d8cadb6af

Merge with stable

Have verbose and debug flag print the changeset rev and hash when committing. Besides updating the tests output, I had to push back at the end the test for issue1193 in test-commit, solved by cset 4386a7706828, because it was using the current date for commit and was randomizing the subsequent hash. [ original upstream description ]

Backed out changeset d557749c627a Replace this change with a better one. [ original upstream description ]

(0.9.2compat) remove new verbose commit message for backwards compatibility

(stable) merge with default

Have verbose flag print the changeset hash when committing [ original upstream message ]

(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.

Avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.

(stable) merge with default

(0.9.2compat) fix test compatibility Comment out non-backwards compatible hgweb test (at default position). Make kwexpand nonexistent work on Windows (originally by pmezard).

Thorough hgweb testing - test hgweb while keyword extension is _enabled_ - check expansion with hgweb.file - besides log and diff, also check annotate for not expanding

(stable) merge with default

(0.9.2compat) add verify to nokwcommands