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