(stable) merge

Add forgotten comment

Make the templater a local variable

Merge with stable

rollback: improve message [ original upstream message ]

rollback: add dry-run argument, emit transaction description [ original upstream message ]

Do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.

Merge with stable

keywords: build a new templater to work around caching interaction

(0.9.2compat) improve quoting of environment variable in test

Merge with stable

Tests with spaces in paths This allows most tests to succeed with ./run-tests.py --tmpdir='/tmp/hg test' and introduces other tests for spaces and shell quoting [ original upstream message ]

(0.9.2compat) get applicable changes from default

(stable) merge Even though this is a fake standalone branch, we do not include the patch that removed extension path detection in kwdemo.

Make kwdemo less verbose 1) Set the branchname always silently with dirstate.setbranch(). We create a branch so that testing the {branches} template does not come up empty. But kwdemo is hardly the place to inform the user by inference why {branches} is empty on the default branch. "demobranch" is ascii and cannot be changed, so using the internal command instead of commands.branch() is safe. 2) Do not show full path to temporary directory (distracting long lines on Mac OS X). 3) No special debug output. Output only related to keyword, no internals like unsetting of commit hooks etc.

1 variable name for overwriting candidates

Do not customize ui.note() when overwriting Behaviour change: hg commit --verbose now prints out the names of the files which are overwritten.

Mark improved demo commit message for translation s/config/configuration/ Inside the quoted command put the message in single quotes in case the translation contains apostrophes.

(0.9.2compat) update copyright _and_ licence

(stable) merge

Update copyright

Remove deprecated options

Merge with stable

run-tests.py: skipped tests shouldn't change working directory [ original upstream message ]

run-tests.py: clears http_proxy for all tests [ original upstream message ]

(stable) merge

(0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown Switch long option name from --untracked to --unknown.

(0.9.2compat) use status' names for readability

Remove spurious locks, improve handling of wlock - kwcommitctx is inside the wlock of repo.commit: no lock - _kwfwrite only needs wlock wlock outside try block, so we don't need to import lock.release _kwfwrite should even be safer that way, as we moved the status call inside the try-except block. Thanks to Benoit Boissinot for help.

Use status' names instead of index

(stable) merge

Do not postpone commit hooks With 0e64d814d7d0 in place, this hack is not needed any more.

Merge with stable

fix up a bunch of check-code warnings [ original upstream message ]

run-tests: kill daemons on ^C with -j. This is not perfect, but the problem is fundamentally racy. [ original upstream message ]

run-tests: split tests/blacklist in tests/blacklists/* Following discussions with Gilles Morris [1], it seems that it is preferable to use several blacklist files in a blacklists/ directory. It is easier to add an unversioned file for experiments than modifying a tracked file. Also fall back to a simpler syntax, giving up ConfigParser, now that section names are not needed anymore. And allow --blacklist parameter to be a complete path, instead of only one of the filenames contained in tests/blacklists/ [1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html [ original upstream message ]

many, many trivial check-code fixups [ original upstream message ]

filelog: sort meta entries, ensure deterministic order [ original upstream message ]

(0.9.2compat) fix utcdate filter

Merge with stable

Fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.

Merge with stable

Update license to GPLv2+ [ original upstream message ]

(0.9.2compat) load extensions with "ext ="

(0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted See 52b03aad673b, 13a6a2c0440f.

(stable) merge

run-tests.py: update

tests: load extensions with "ext ="

Go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.

Do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.

Merge with stable

keyword: clarify object of backwards compatibility [ original upstream message ]

(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output Keep $RCSFile$ for backwards compatibility.

(stable) merge

The CVS keyword is $RCSfile$, not $RCSFile$ http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords Fix default keyword map accordingly. Keep $RCSFile$ for Mercurial backwards compatibility.

Merge with stable

keyword: sort demo output to ensure deterministic output [ original upstream message ]

Merge with stable

(0.9.2compat) update wiki url

hg.clone: report branch name on update [ original upstream message ]

change wiki/bts URLs to point to new hostname [ original upstream message ]

(stable) merge

Uppercase short option for kwfiles --all, like hg status -A Deprecate kwfiles -a.

Make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.

Make kwfiles --all show unknown files too More consistent and similar to hg status.

kwfiles --unknown instead of --untracked Use the same option name as "hg status". Retrieve option in _status(). Mark --untracked as deprecated.

Merge with stable

hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change. [ original upstream message ]

(0.9.2compat) do not mark debug message for translation

Merge with stable

do not attempt to translate ui.debug output [ original upstream message ]

(stable) merge with default

(0.9.2compat): run kwdemo before setting up [keyword] files Ensures that kwdemo runs correctly without further configuration. Also no need to specify --default option.

test: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.

Merge with stable

test-keyword: update output to match 5d49fdef6fd0 [ original upstream description ]

(0.9.2compat) update and rewrap documentation

(0.9.2compat) prefer util.datestr over time module import We keep the function in this branch to catch the TypeError.

(0.9.2compat) remove "help keyword" from test

(stable) merge

Use util.datestr for utcdate filter, make it accessable in variable lambda syntax mimicking templatefilters.py

Reference templating help, add utcdate filter example

Remove "help keyword" from test Testing help output does not make sense as we have no way to check for errors in content which would be the only reasonable test here.

Refactor kwdemo and make output translatable Better reflect the actual behaviour of the extension: - Make map arguments and -f/--rcfile not mutually exclusive but extend the current configuration - Map arguments and -f/--rcfile both override the defaults even when -d/--default is specified - -d/--default only overrides the current configuration Inform the user about extending/overriding behaviour, but only at the beginning; the following messages become terser, making the output translatable without too much code clutter. Rephrase help (use "short/long" option notation etc.).

(stable) merge

Update copyright

(0.9.2compat) update copyright

Merge with stable

help: use field lists for lists of extensions [ original upstream message ]

minirst: indent literal blocks with two spaces The vast majority* of them are formatted like this in the source, so this basically reverts the output to how it looked before we got the minirst parser. *: the help on templating use four spaces for some examples and will now shown with an indentation of just two spaces. [ original upstream message ]

Merge with stable

keyword: wrap docstrings at 70 characters [ original upstream description ]

commands: use minirst parser when displaying help [ original upstream description ]

(stable) merge

(0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix)

Argument to "kwdemo --rcfile" must be string (bugfix)

Reformat kwfiles help for minirst parser

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

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 ]