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.