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

(0.9.2compat) do not bother about debug templates

Do not test debug templates

Make match object function private to kwtemplater.substitute

Do not bother about debug templates Speedup of debug flag toggle dubious at best. {files}, {file_adds} etc. templates do not make sense in file context, but leave decision to user; that's what kwdemo is for.

(0.9.2compat) kwfiles print code similar to commands.status

kwfiles print code similar to commands.status

Rearrange commit hook hack

Commit hook handling entirely into if-condition

(0.9.2compat) update doc strings

Add commit hook test

Postpone commit hooks until keywords are expanded If a commit hook acts on a file with keywords, it now does so on the file with keywords already expanded. Unhook all hooks with "commit" in name during kwdemo.

Avoid dispatch import, revert to simple argument parser

(0.9.2compat) avoid dispatch import, revert to simple argument parser Make nokwcommands a tuple as long as it's private. No need to import fancyopts, as we use own w/o bug. Clean overriding of findcmd. We only need simple argument parsing for command. No expensive dispatch import, also avoids potential clashes with invasive RuleDispatch (setuptools).

Make keyword against current Mercurial available as standalone extension

Branch off backwards compatible version The default branch will contain the version without the overhead for backwards compatibility. This will make a standalone extension available which works with current Mercurial.

Avoid name conflict with dispatch package(s) Thanks to Marcin Kasperski for spotting and analysing this. Message-ID: <87wsswvhbk.fsf@cauchy.softax.local> ff.

Add convert to nokwcommands (fix issue802) Is there a more general way to decide on allowed commands? Unfortunately we don't know what commands are added by extensions.

Check if there candidates before _overwrite Potentially saves calculation of node.

Arrange commands and cmdtable in alphabetical order

Tell user that kwexpand/kwshrink do not run if given files contain changes

Respect Mercurial conventions in kwdemo help

Obtaining cwd redundant in pathto wrapper

Detailed test of kwexpand/kwshrink w/ file arguments

Revert to using status for kw-commands cmdutil.bail_if_changed has to call status stat'ing working dir. This renders the whole walk experiment mute, duh. On the upside kwexpand/kwshrink can be applied to selected clean files, while there are local changes in other files. bail_if_changed compatibility wrapper not needed anymore.

Test if warning about non-existing files is triggered

cwd optional argument of _pathto to simplify _kwfwrite