(stable) merge

tests: unify test-keyword

Merge with stable

rollback: fix up tests [ original upstream message ]

Merge after backout

Backed out changeset bceb04857ce1 (not all upstream hunks applied)

tests: catch re.error if test line is not a valid regular expression [ original upstream message ]

tests: basic support for unified tests [ original upstream message ]

tests: move script execution in runner helpers [ original upstream message ]

(stable) merge

Move collecting of [keyword] patterns to reposetup (issue2303) When cloning, prevent [keyword] filename patterns configured locally in the source directory to persist during the update in the destination. a) move [keyword] retrieval (back) to reposetup b) remove the corresponding global kwtools attributes Add test cases.

(stable) merge

Add extra datefilters in a single update call

(stable) merge

Postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.

Merge with stable

help: show value requirement and multiple occurrence of options this helps users to know what kind of option is: - no value is required(flag option) - value is required - value is required, and multiple occurrences are allowed each kinds are shown as below: -f --force force push -e --ssh CMD specify ssh command to use -b --branch BRANCH [+] a specific branch you would like to push if one or more 3rd type options are shown, explanation for '[+]' mark is also shown as footnote. [ original upstream message ]

(stable) merge

Force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.

Pass context to kwtemplater.overwrite Now that we have retrieved the context in every calling function except commit, pass it as argument to kwtemplater.overwrite to avoid looking it up twice. Reorder arguments to kwtemplater.overwrite to reflect their importance. Turn node argument into a simple boolean and rename it to iswctx.

Retrieve added and modified files from commitctx

Merge with stable

move working dir/dirstate methods from localrepo to workingctx [ original upstream message ]

(stable) merge

Use context to detect uncommitted merge

(stable) merge

Offer svn-like default keywordmaps svn-like default keywords can be set in a new configuration section called [keywordset] -- thanks to timeless for the name. Move setup of default keywordmaps into dedicated function used by kwtemplater.__init__ and demo. HeadURL/URL is not supported (by default).

Add 2 svn-like date filters svnisodate yields the format the date in svn's Id keyword expands to. svnutcdate yields the format svn's Date/LastChangedDate expands to. http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html

Merge with stable

Use our custom hg reStructuredText role some more I missed these occurrences on my first scan through the source. [ original upstream message ]

Merge with stable

rollback: fix up tests [ original upstream message ]

(stable) merge

commit: note new branch heads rather than topological heads Move to using contexts while we're at it. [ original upstream message ]

Support extensions using dorecord, e.g. crecord Provide extendable keyword.recordextensions variable, so other extensions beside hgext.record which provide the dorecord function can cooperate with hgext.keyword like so (example from crecord): def extsetup(): try: keyword = extensions.find('keyword') keyword.restricted += ' crecord qcrecord' try: # use record support in keyword.py if present keyword.recordcommands += ' crecord qcrecord' keyword.recordextensions += ' crecord' except AttributeError: pass except KeyError: pass

(stable) merge

Omit setting extra variable for record context Since dc2f37864348 the context is always retrieved in kwtemplater.overwrite().

(stable) merge

Simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible

(stable) merge

Cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record

Merge with stable

run-tests: add --view switch to use external diff viewer [original upstream message ]

run-tests: sort options [original upstream message ]

run-tests: add -l short option for --local [original upstream message ]

(stable) merge

Test recording

Support (q)record Monkeypatch hgext.dorecord to trigger keyword expansion. Read data from working directory, not from filelog. Prevent keyword expansion from within record's commitfunc, thereby fixing a bug/inconsistency where files which are clean after recording were overwritten twice.

Remove mq commands from restricted list Monkeypatching patch.diff takes care of this since 911f5be5d159. Test mq more thoroughly by loosening [keywordmaps] and comparing the output of hg cat with keyword expansion enabled and disabled.

Replace deprecated mq commands in test

Merge with stable

Use hg role in help strings [ original upstream message ]

Merge with stable

keyword: monkeypatch patch so that optional args can be passed as kwargs [ original upstream message ]

Merge with stable

run-tests.py: can't remove from os.environ on solaris [ original upstream message ]

Merge with stable

pylint, pyflakes: remove unused or duplicate imports [ original upstream message ]

Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway. [ original upstream message ]

run-tests.py: reset env variables set by hooks [ original upstream message ]

Merge with stable

run-tests: force to test pure on pypy as well [ original upstream message ]

Fix run-tests.py -jX after 2ed667a9dfcb [ original upstream message ]

tests: adapt the test runner to work with jython [ original upstream message ]

run-tests: make sure GREP_OPTIONS isn't set This can interfere with test output, especially for options like --color. [ original upstream message ]

tests: use external coverage, mandate newer version This removes the option for including the stdlib in coverage reports. [ original upstream message ]

templater: readable dates older than 24 months revert to ISO8601 (issue1006) [ original upstream message ]

(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 ]

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

Add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.

(0.9.2compat) context, status refactor keeping backwards compatible fallback

(0.9.2compat) ddb8a222249b is backwards compatible

Merge with stable

util: add sort helper [ original upstream description]

status: clean up all users for unknown files [ original upstream description]

repo.status: eliminate list_ [ original upstream description]

add __len__ and __iter__ methods to repo and revlog [ original upstream description]

manifest: remove execf/linkf methods [ original upstream description]

use repo[changeid] to get a changectx [ original upstream description]

simplify flag handling add _checklink var to dirstate introduce dirstate.flagfunc switch users of util.execfunc/linkfunc to flagfunc change manifestdict.set to take a flags string change ctx.fileflags to ctx.flags change gitmode func to a dict remove util.execfunc/linkfunc [ original upstream description]

use repo.changectx(None) to get a workingctx [ original upstream description]

context: avoid using None for working parent [ original upstream description ]

use repo.changectx rather than context.changectx [ original upstream description ]

(stable) mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

(0.9.2compat) secure keyword arguments in backwards compatible wrappers Explicitly assign _all_ keyword args when TypeErrors must be detected.

keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.

(0.9.2compat) disable expansion for annotate

keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.

Merge after backout Revert to dispatch._parse for grabbing current command name.

Backed out changeset 10ebb9f44b99 Tests with "hg annotate" reveal that dispatch._runcommand is unreliable for our purpose.

(0.9.2compat) get some changes from default branch We stay with old-fashioned command _parsing because a _*runcommand method was introduced after 0.9.2

keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

keyword: use dirstate.parents to obtain current first parent This should be quicker than changectx().node()

keyword: monkeypatch dispatch._runcommand instead of _parse We want the current command, and hooking into this method makes it more transparent what we are doing.

(stable) merge with default to fix import from crew 1 hunk that removed "files" argument from patch.diff forgotten by me.

Incorporate latest changes in backwards compatible way

Fix arguments for patch.diff monkey

Merge with stable

(stable) ignore .DS_Store

match: remove files arg from repo.status and friends [ original upstream message ]

match: remove files argument from patch.diff [ original message from upstream ]

walk: remove remaining users of cmdutils.matchpats [ original message from upstream ]

Merge with stable

(stable) patches from default in 4b2c266bf059 Revert to util.binary, as checks entire data for \0 now.

(0.9.2compat) backwards compatible changes from default uisetup was introduced after 0.9.3, so not used. Therefore different handling of monkeypatches.

Reduce opt=arg syntax even more

Check for '\0' in entire data before acting util.binary might not be safe enough, as it fails eg. on certain pdf files (issue1066). In some cases this might even be a speed gain as there will be no vain re.sub(n)/search on huge data.

Make overwrite() arguments mandatory

Compact argument passing to wrapped methods

Privatize remaining monkeypatches by moving them into reposetup Make it more transparent if and when monkeypatches are needed.

Collect filename patterns, wrap dispatch._parse in uisetup Store [keyword] config in kwtools. hgcmd defaults to empty string.

Merge with stable

Adapt to new webcommands with "clean" monkey patches

(0.9.2compat) fix and simplify webcommands monkey

(0.9.2compat) add test for web changeset web filediff has no backwards compatible url, so omit. Also remove clone updating status from new hg versions.

(0.9.2compat) fix webcommand monkey patches, and adapt to most recent changes

(0.9.2compat) no conditional for web file match disabling

hgweb: refactor hgweb code [ original upstream description ]

Merge with stable

tests: add tests for hgweb to test-keyword [ original upstream description ]

Merge with stable

clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved [ original upstream description ]

tests: remove some unnecessary sleeps [ original upstream description ]

Ignore .DS_Store

(0.9.2compat) ignore .DS_Store

Merge with stable

(0.9.2compat) expand * import

Expand import * to allow Pyflakes to find problems [ original upstream description ]

(0.9.2compat) get fix from stable branch

keyword: remove "identify" and "remove" from nokwcommands These two commands care about the list of modified files returned by repo.status and we may need to do a full content comparison to populate that list. [ original upstream description ]

Merge stable with default

(0.9.2compat) incorporate changes from default branch

Rename kwx to kwtools

Fix getnode doc, add doc for patch.diff monkey

(0.9.2compat) FIX typo in hgweb monkeys

Remove whitespace at eol

(0.9.2compat) remove whitespace at eol

(0.9.2compat) get changes from default branch Note: test not yet updated, as <0.9.4 complains about symlink patch, works "in principle" though.

Do not inspect node1 for diff if node2 is given

Add test for patch.diff monkey

Make main class and hg command accessible Switch from global vars to top level dictionary. Goal: make it easier for external tools (like tortoisehg) to hook into keyword extension.

Move expand/shrink decisions into kwtemplater - do not clobber wrapper code - get rid of clumsy kwtemplater attributes

Remove obsolete variable declaration

Merge with stable

Monkeypatch patch.diff for non-interactive diffs Avoid clobbering diffs with expanded keywords eg. for notify extension.

(stable) merge with default branch

(0.9.2compat) add glog to nokwcommands

Add glog to nokwcommands

(0.9.2compat) use different names for web methods Makes it clearer that these are not redefinitions of the same methods.

(0.9.2compat) web as in default where possible

Switch off expansion for web diffs

(0.9.2compat) incorporate changes from default branch _iskwfile used by 2 functions again.

Make restrict entirely a kwtemplater attribute

keyword: declare globals in a more compact way

keyword: avoid os import by using util.splitpath

Merge with stable

test-keyword: make it run under Windows - don't cat symlink, content differs - rewrite OS specific messages - generate symlink with a bundle [ original upstream message ]

keyword: fix symlink detection under Windows [ original upstream description ]

keyword: fix mq repository detection under Windows [ original upstream description ]

(stable) merge with default branch

(0.9.2compat) make patchfile monkey work with 0.9.5

(0.9.2compat) incorporate changes from default branch Testing reveals no name conflict with RuleDispatch's dispatch module. At least not with 0.9.* release versions.

Ignore everything starting with .hg Tough luck for those who want keywords in .hgignore ;)

Monkeypatch dispatch._parse to avoid running it twice Inspired by Thomas Arendsen Hain.

Do not set up kwrepo when pulling from bundlerepo Spotted and test case provided by pmezard.

Fix pychecker warning about shadowed variable Also no underscore prefix for restrict inside reposetup.

Safeguard anything under .hg, and the .hg_archival.txt file

Prevent expansion in queue repo and for email Saveguard needed for global [keyword] filename patterns.

(0.9.2compat) discard wread/wwrite approach

(0.9.2compat) get changes from stable branch

Discard wread/wwrite approach, merge with stable A basic "hg update" did not give correct results.

Fix filewise expansion for hgweb Also make changectx argument to kwtemplater.expand.

Test unbundle null revision containing empty symlink Spotted by pmezard.

keyword: fix my string pasting thinko Spotted by Maxim Dounin [ original upstream description ]

Make nokwcommands, restricted string variables at top level - prettier syntax conforming eg. to commands.norepo - possibly easier to hook from outside

Split line continuation in 2 steps (style)

Add empty_ok argument to kwrepo.commit

Allow keyword expansion on clone If [keyword] filename patterns are specified in a global hgrc keywords will be expanded in clone. This behaviour is more consistent but also more dangerous. Specifying global, and thus more complicted, [keyword] patterns might slow things down as well. Mention this in help?

(0.9.2compat) expand keywords in raw web output, and other changes from default branch Comment out import related tests, as not always available.

Remove obsolete test message

Fix web output: expand to requested rev; kwcat: wrap cat, avoid filelog subclass

Expand keywords in hgweb rawfile output

(0.9.2compat) use templatefilters module if available; bail out in mq dir Revert to always using full definition of repo._link.

Disable expansion in mq directory; add test for qcommit There might still be problems with qsave copied patch queues.

Adapt to templatefilters module splitoff

templates: move filters to their own module This eliminates just about all Mercurial dependencies in templater.py [ original upstream description ]

Ensure that absolutized paths from hgrc do not contain ../ segments. [ original upstream description ]

stable branch: reflects latest Mercurial upstream state

(0.9.2compat) clean import handling when patchfile class available Change help and test output accordingly.

(0.9.2compat) restructure based on wwread/wwrite methods as in default branch

Handle LookupError eg. for hg convert

Add empty_ok argument to commit

Update test using kwcat

Implement kwcat command

Make kwtemplater kwrepo attribute instead of global variable

Refactor overriding wread, wwrite, wwritedata repo methods - restrict consistently to reading/writing in working dir - no cludgy sys.argv parsing anymore Eases collaboration with other extensions, or external tools like TortoiseHg. Changes in behaviour: - hg cat does not expand; will be implemented with new kwcat command - no expansion in web /display/, only in downloaded archives Thanks to Jesse Glick for inciting this approach.

(0.9.2compat) fix external hook as in default branch

Return silently when external command triggers error - make hook accept hg command as string or as function object. - intercept dispatch.ParseError as well. Kudos to Steve Borho (TortoiseHg) for testing and debugging.

(0.9.2compat) implement external call handle and hook

Implement handle and hook for external callers Allows external callers that do not use the command line to pass current hg command to keyword extension. This implementation might change in the future, if wrapping of patch.diff is possible to the effect of avoiding external handles.

Get changes from default branch; update test output

Detect restricted commands thru variable

Improve use of dictionaries - iteritems() where we do iter over dicts' items - store commithooks in dictionary (safe, as hook.hook() sorts before execution)

bugfix: avoid expansion with qfold

Prefer item in dict over dict.has_key(item) Message-ID: <4792DB2A.7050909@serpentine.com>

(0.9.2compat) get mq support, improved diff output from default branch Reimplement _parse wrapper obtain diff options.

Add a very simple mq test

Avoid extra diffs when not comparing against working dir When diffing against specified revisions expanded keywords only get in the way. Update test output.

Implement support for mq; handle (q)record more gracefully mq: Ensure that expanded keywords do not make it into patches. - disable expansion when reading filelog - shrink expanded keywords when reading from working dir (wread) (q)record: Avoid additional hunks due to expanded keywords. However this is still a compromise, as keyword expansions are not updated in working directory because record should not overwrite files. Mention above shortcomings and "hg kwexpand" workaround in help and update test output. system argument parsing: Command detection might be slightly more expensive with dispatch._parse, but we will need this for improving "hg diff" output.

(0.9.2compat) get changes from default branch

Merge Solaris test compatibility

Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.

Test that expansion is done filewise Checks issue fixed in c5bba07dadd5.

Fix some doc strings; update copyright

(0.9.2compat) test: avoid "sed -i" in commented rejecttest

Don't use the -i option with sed This patch fixes test-keyword on platforms without GNU sed (like OpenBSD).

(0.9.2compat) Get bugfix from default branch

Suppress keyword expansion for log commands With previous bugfix "hg log -p" expanded keywords. Turn off again by making log, tip nokwcommands.

fix: only set general changenode for kwtemplater when committing kwexpand must always obtain changenode from filectx, otherwise current changenode is expanded in every file. Also fixes "hg cat <more than 1 file>".

(0.9.2compat) obtain simplifications from default branch

Just add unknown kwfiles candidates when untracked option is given

Simplify temporary ui.quiet setting in kwdemo

(0.9.2compat) test: redirect "cd -" output to /dev/null

test: redirect all "cd -" output to /dev/null

(0.9.2compat) add rejecttest as comment, as it is not working in this branch

test: rename (misleading) conflicttest to rejecttest

(0.9.2compat) get backwards compatible changes from default branch Clean commit hook handling and avoidance of import rejects are missing from backwards compatible branch.

README: fix help instruction Spotted by Thomas Arendsen Hein.

Compress kwfstats intitialization

Always opts.get to be on safe side

Make command line check even more private

Turn patch.patchfile.__init__ monkeypatch into a wrapper While the nastiness is even more blatant, this makes us independent from changes in patchfile.__init__. After all we only need to potentially change patchfile.lines.

Test potential import conflict

Avoid import and merge conflicts caused by expanded keywords While monkeypatching patch.patchfile.__init__ is brute force and dirty, it seems the least intrusive method.

Do not pass global _kwtemplater around in arguments

Remove spurious echo from test

(0.9.2compat) use updated fancyopts from 88803a69b24a

(0.9.2compat) implement context based changes from default branch NOTE: Interrupted commit is broken with versions < 0.9.5! Leave tests outcommented.

Reintroduce _iskwfile with link method as argument Rename kwtemplater.match to matcher analogous to util.matcher.

Make path format output switches more compact

Set kwtemplater.path at kwfilelog initialization

Refactor to initialize kwtemplater only once during reposetup - when overwriting kwtemplater was initialized (and the same keyword regex compiled) before and with every file read. - therefore remove overwrite from kwtemplater, and make it private method. _ matcher becomes attribute of kwtemplater. - by making kwtemplater a global, avoid adding attribute to ui.

Rename kwtemplater.t to kwtemplater.ct

Test that commit hooks are not run on interrupted commit

Do not run commit hooks if there is no node Eg. when commit is interrupted.