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

Use pathto to display nonexisting files

kwexpand/kwshrink: warn about nonexisting files

_overwrite method for kwrepo.commit, kwexpand, kwshrink File selection (kwexpand/kwshrink) in _kwfwrite method.

Sort files before overwriting

_iskwfile checking method for kwrepo.commit, kwexpand/kwshrink

Walk manifest in kwexpand/kwshrink

For overwriting commands use node and manifest to speed up walk

kwfiles: change option "ignored" to "ignore", add option "untracked" "ignore" like corresponding config value. "untracked" allows quick check if a new file that has not been added yet would be target for expansion. Update help accordingly.

File collections specific to kwexpand/kwshrink vs kwfiles commands

Flag kwfiles if verbose; shorten bailout code

Tighten condition for kwshrink/kwexpand test

Underscore prefixes only for names at top level, or compatibility wrappers

Count keywords in a customized kwfilelog read method

walkopts for kwexpand, kwshrink, kwfiles commands kwfiles optionally shows ignored files or all flagged Use pathto method to print kw filenames if possible. Commands abort with meaningful error _weedcandidates renamed to _weedfiles, and only for commands. For kwrepo.commit we could get modified + added from kwrepo.status(match=ui.kwfmatcher) -- but this would mean to read manifest before commit, and again after for expansion.

kwfiles notifies if there are no files configured for expansion

Bail out earlier in overwrite commands if repo has changes

Make kwfmatcher an ui attribute Thus kw commands do not weed candidates twice.

Unlowercase command help

Test kwfiles working context

Determine kwfiles on workingctx Added but not yet committed files should be shown. Removed but not yet committed files should not be shown.

test: use grep instead of grep -F

Test if debug flag influences expansion

Turn off debug while expanding We don't need templates like file_add etc. as keywords a file specific. Turning off debug avoids accidental expansion of such templates. As a side effect it speeds up expansion when running hg --debug. Functionality of _ctxnode now in new _substitute function.

Map re.escape

List comprehension instead of loop to create ui template dictionary

String format keyword pattern before compilation

Ignore errors when removing temp dir in kwdemo

Reduce verbosity of kwexpand/kwshrink

Make kwfilelog.cmp test reliable

Use revlog.cmp to avoid checking for rename twice

Test kwfiles command

New command "kwfiles" prints files configured for expansion

Always exclude .hgtags only .hgtags is the only tracked file that is written to just by issuing an hg command. This ensures that even a very unlikely tag like "$Id$" is processed properly.

Use Mercurial's getcwd()

Set boolean mandatory arguments directly and comment them

Avoid calling kwfmatcher twice (kwtemplater.overwrite, kwrepo.file) when overwriting _weedcandidates already checks if file is configured for keyword substitution.

Test kwshrink w/ argument while not in top level directory

Arguments to kwshrink/expand must be filtered thru canonpath

Rename README.txt to README

Move version code into setup.py getversion() is only needed by setup.py, as there is no interface to query the version of an hg extension.

Document revisions of interface changes

Catch TypeError in repo.wwrite for Mercurial rev 656e06eebda7 This is the one revision that had the file descriptor removed, but the flags argument not added yet.

Compatible repo.dirstate.normal/update into own function Also remove if-clause, loop over empty list instead.

Compatible repo.wwrite into own function

Compatible changeset_templater in own function

Improve doc of kwfilelog.read

Keep names of inherited commands Eases interactive documentation lookup. Except for _parse which moved from cmdutil.parse to dispatch._parse, there prefer most recent name.

Move backwards compatible commit fork into private kwrepo function

Remove spurious NameError checking for locks Overriding commit sets them to None by default already.

Clean up backwards compatibility Overriding findcmd is obsolete. Override _parse at top. Prefix overridden functions with underbar.

cmdutil.parse moves to dispatch._parse; use fancyopts bugfix Copy fancyopts from 88803a69b24a as _fancyopts to make argument parsing reliable.

Removed files are detected by _weedcandidates, no need for status call

Document revision that fixed fancyopts

Test "hg diff --rev", update _getcmd comment (backwards compatibility)

Test that pattern does not span more than 1 line

Shorten template setup

ui inheritance does not need to be fiddled with anymore Backwards compatibility tests work with at least 0.9.2

Include MANIFEST.in in dist; hgignore MANIFEST

setup: add url, reformat

test: use grep -v instead of sed to delete lines

try for dirstate.update instead of hasattr

Stricter regex; regroup kwtemplater init code

Test remove

Add forgotten status for touch copy test

Weed out removed and links using manifest Weeding of expansion candidates in helper function. No status call in commit. All commit stuff is done after super commit. Minus 2 backwards compatibility switches. Get rid of os import.

hgignore build directory

help: no need for kwexpand after import, but after config change Update test output.

kwdemo fixes and tweaks Write map arguments in repo hgrc, to simulate parsing and parsing errors. Add branch display; change demo verbosity for branch command. Display current [keyword] files additionally to demo.txt, as they might influence the result. Formatting: status indented by tab.

Adapt to recent changes in Hg (locks handling, dirstate.update gone)

Show extension in kwdemo; flag helpers; rephrase doc Update test and test output.

Make more args mandatory; flag keywordmatcher as helper

Treat wlock the recommended way <http://www.selenic.com/mercurial/wiki/index.cgi/Dealing_With_Destructors>

kwdemo: clear up repo, ui inheritance; show commit log in debug output Do not translate "hg ... ci ...".

Add grep, init to nokwcommands; make variables, getcmd local Remove checking of ParseError - was done before, and might be in cmdutil. nokwcommands as list, can be appended to.

Clean up logic and messages for overwrite Obtain both findcmd, bail_if_changed via try error block. Change test output accordingly.

Make test more adaptive to different Hg versions

Make sure there are no newlines in expansion Note confinement to one line in help. Adapt test output.

Removed tag archive

Removed tag nohook

Removed tag hgkw_standalone_setup

Removed tag very_cvs

Removed tag r0.1

Removed tag cvs_scheme

Removed tag universal_scheme

Discard kwmap-templates branch; keep only early forked off default

Discard self_initializing_hook branch

Add MANIFEST.in

Add README

Add backwards compatible test-suite Without symlink testing, as older Hg versions don't handle them.

Catch an AttributeError in wwrite triggered by older Hg versions Thanks to Norman Walsh for reporting.

kwdemo accepts maps as arguments, reads from optional rcfile

Avoid global vars by passing opt args to kwrepo.file "Normal" reading of filelog just expands keywords in given data. Reading filelog for overwrite on commit, kwshrink, kwexpand triggers kwtemplater.process, which returns read data (expanding in case of commit, kwexpand; not expanding for kwshrink) and a count of keywords. If kwcnt is positive file will be overwritten.

Implement kwshrink/kwexpand commands to deal with config, import issues

Set ui to repo.ui at once where needed for backwards compatibility

Use ui.note to get verbosity switch; tweak kwdemo help

Obtain filename matcher from function keywordmatcher Future implementation of commands kwexpand/kwshrink will also need this.

kwdemo is demo internally; rearrange code

Typo in kwdemo output

Fix ui inheritance for kwdemo kwdemo config changes had no effect if keyword.py was not in hgext. For backwards compatibility we use repo.ui in reposetup, so inside kwdemo the temporary _repo.ui has to obtain the paramters.

Add kwdemo command as online config help Shorten "hg help keyword" output accordingly. Mention utc date template filter in extension help.

wwread and wwrite methods for expansion in working dir

Cosmetic changes for overwrite condition, single quotes

Change ui inheritance to stay compatible with recent Hg Needed for rollback on interrupted commit.

Handle rename and copy properly Touching a renamed or copied file made it seem modified.

filectx does not need filelog; more nokwcommands Improve docs.

Revert to kwrepo methods (self) inside class kwrepo

Pass filelog, not kwfilelog, to kwtemplater.expand/context.filectx

More nokwcommands: add, remove, addremove

Remove unused path attribute from kwfilelog

Reduce use of kwrepo methods Use repo and ui arguments from reposetup where possible. kwfmatcher doesn't need to be an attribute to repo.

reverse logic for detection of excluding commands Exclude all "outgoing" commands. rollback does not change working dir. incoming -p does not expand anyway. Revert ui -> repo.ui for backwards compatibiliy in reposetup.

Obey Mercurial line continuation convention

Remove obsolete archive mode from __doc__

Confine activation to specific commands; drop broken archive configuration

Move findcmd switch to imports

findcmd might be in cmdutil or commands, depending on hg version

No need for archivemode as variable