Thu, 31 Jan 2008 14:44:19 -0600 templates: move filters to their own module stable
Matt Mackall <mpm@selenic.com> [Thu, 31 Jan 2008 14:44:19 -0600] rev 363
templates: move filters to their own module This eliminates just about all Mercurial dependencies in templater.py [ original upstream description ]
Tue, 08 Jan 2008 22:40:51 -0500 Ensure that absolutized paths from hgrc do not contain ../ segments. stable
Jesse Glick <jesse.glick@sun.com> [Tue, 08 Jan 2008 22:40:51 -0500] rev 362
Ensure that absolutized paths from hgrc do not contain ../ segments. [ original upstream description ]
Fri, 01 Feb 2008 08:16:56 +0100 stable branch: reflects latest Mercurial upstream state stable
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Feb 2008 08:16:56 +0100] rev 361
stable branch: reflects latest Mercurial upstream state
Thu, 31 Jan 2008 14:34:45 +0100 (0.9.2compat) clean import handling when patchfile class available 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 31 Jan 2008 14:34:45 +0100] rev 360
(0.9.2compat) clean import handling when patchfile class available Change help and test output accordingly.
Wed, 30 Jan 2008 10:38:10 +0100 (0.9.2compat) restructure based on wwread/wwrite methods as in default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jan 2008 10:38:10 +0100] rev 359
(0.9.2compat) restructure based on wwread/wwrite methods as in default branch
Wed, 30 Jan 2008 01:24:10 +0100 Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jan 2008 01:24:10 +0100] rev 358
Handle LookupError eg. for hg convert
Tue, 29 Jan 2008 21:15:57 +0100 Add empty_ok argument to commit
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 21:15:57 +0100] rev 357
Add empty_ok argument to commit
Tue, 29 Jan 2008 17:33:00 +0100 Update test using kwcat
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:33:00 +0100] rev 356
Update test using kwcat
Tue, 29 Jan 2008 17:32:25 +0100 Implement kwcat command
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:25 +0100] rev 355
Implement kwcat command
Tue, 29 Jan 2008 17:32:15 +0100 Make kwtemplater kwrepo attribute instead of global variable
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:15 +0100] rev 354
Make kwtemplater kwrepo attribute instead of global variable
Tue, 29 Jan 2008 17:32:10 +0100 Refactor overriding wread, wwrite, wwritedata repo methods
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:10 +0100] rev 353
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.
Fri, 25 Jan 2008 21:42:52 +0000 (0.9.2compat) fix external hook as in default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 25 Jan 2008 21:42:52 +0000] rev 352
(0.9.2compat) fix external hook as in default branch
Fri, 25 Jan 2008 17:31:55 +0000 Return silently when external command triggers error
Christian Ebert <blacktrash@gmx.net> [Fri, 25 Jan 2008 17:31:55 +0000] rev 351
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.
Wed, 23 Jan 2008 12:33:24 +0100 (0.9.2compat) implement external call handle and hook 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 12:33:24 +0100] rev 350
(0.9.2compat) implement external call handle and hook
Wed, 23 Jan 2008 12:31:41 +0100 Implement handle and hook for external callers
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 12:31:41 +0100] rev 349
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.
Wed, 23 Jan 2008 11:38:22 +0100 Get changes from default branch; update test output 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 11:38:22 +0100] rev 348
Get changes from default branch; update test output
Wed, 23 Jan 2008 11:36:37 +0100 Detect restricted commands thru variable
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 11:36:37 +0100] rev 347
Detect restricted commands thru variable
Wed, 23 Jan 2008 09:53:40 +0100 Improve use of dictionaries
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 09:53:40 +0100] rev 346
Improve use of dictionaries - iteritems() where we do iter over dicts' items - store commithooks in dictionary (safe, as hook.hook() sorts before execution)
Wed, 23 Jan 2008 10:02:57 +0100 bugfix: avoid expansion with qfold
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 10:02:57 +0100] rev 345
bugfix: avoid expansion with qfold
Sun, 20 Jan 2008 14:31:00 +0100 Prefer item in dict over dict.has_key(item)
Christian Ebert <blacktrash@gmx.net> [Sun, 20 Jan 2008 14:31:00 +0100] rev 344
Prefer item in dict over dict.has_key(item) Message-ID: <4792DB2A.7050909@serpentine.com>
Sat, 19 Jan 2008 18:26:17 +0100 (0.9.2compat) get mq support, improved diff output from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Jan 2008 18:26:17 +0100] rev 343
(0.9.2compat) get mq support, improved diff output from default branch Reimplement _parse wrapper obtain diff options.
Wed, 16 Jan 2008 11:22:16 +0100 Add a very simple mq test
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jan 2008 11:22:16 +0100] rev 342
Add a very simple mq test
Wed, 16 Jan 2008 11:22:16 +0100 Avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jan 2008 11:22:16 +0100] rev 341
Avoid extra diffs when not comparing against working dir When diffing against specified revisions expanded keywords only get in the way. Update test output.
Tue, 15 Jan 2008 13:19:23 +0100 Implement support for mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jan 2008 13:19:23 +0100] rev 340
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.
Mon, 14 Jan 2008 15:21:57 +0100 (0.9.2compat) get changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Jan 2008 15:21:57 +0100] rev 339
(0.9.2compat) get changes from default branch
Mon, 14 Jan 2008 15:12:20 +0100 Merge Solaris test compatibility
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Jan 2008 15:12:20 +0100] rev 338
Merge Solaris test compatibility
Mon, 14 Jan 2008 09:00:23 +0100 Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 14 Jan 2008 09:00:23 +0100] rev 337
Solaris compatibility fixes for test-keyword: - do not use /bin/false (yields 255 instead of 1) - do not use "cd -", simply use "cd .." instead.
Fri, 11 Jan 2008 23:36:56 +0100 Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 23:36:56 +0100] rev 336
Test that expansion is done filewise Checks issue fixed in c5bba07dadd5.
Fri, 11 Jan 2008 14:41:22 +0100 Fix some doc strings; update copyright
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 14:41:22 +0100] rev 335
Fix some doc strings; update copyright
Wed, 09 Jan 2008 18:17:23 +0100 (0.9.2compat) test: avoid "sed -i" in commented rejecttest 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 18:17:23 +0100] rev 334
(0.9.2compat) test: avoid "sed -i" in commented rejecttest
Wed, 09 Jan 2008 10:00:18 -0600 Don't use the -i option with sed
Will Maier <willmaier@ml1.net> [Wed, 09 Jan 2008 10:00:18 -0600] rev 333
Don't use the -i option with sed This patch fixes test-keyword on platforms without GNU sed (like OpenBSD).
Wed, 09 Jan 2008 12:52:59 +0100 (0.9.2compat) Get bugfix from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 12:52:59 +0100] rev 332
(0.9.2compat) Get bugfix from default branch
Wed, 09 Jan 2008 11:07:42 +0100 Suppress keyword expansion for log commands
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 11:07:42 +0100] rev 331
Suppress keyword expansion for log commands With previous bugfix "hg log -p" expanded keywords. Turn off again by making log, tip nokwcommands.
Wed, 09 Jan 2008 05:13:22 +0100 fix: only set general changenode for kwtemplater when committing
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 05:13:22 +0100] rev 330
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>".
Mon, 07 Jan 2008 12:02:23 +0100 (0.9.2compat) obtain simplifications from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 12:02:23 +0100] rev 329
(0.9.2compat) obtain simplifications from default branch
Mon, 07 Jan 2008 11:48:51 +0100 Just add unknown kwfiles candidates when untracked option is given
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 11:48:51 +0100] rev 328
Just add unknown kwfiles candidates when untracked option is given
Mon, 07 Jan 2008 11:27:41 +0100 Simplify temporary ui.quiet setting in kwdemo
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 11:27:41 +0100] rev 327
Simplify temporary ui.quiet setting in kwdemo
Sat, 05 Jan 2008 16:47:14 +0100 (0.9.2compat) test: redirect "cd -" output to /dev/null 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Jan 2008 16:47:14 +0100] rev 326
(0.9.2compat) test: redirect "cd -" output to /dev/null
Sat, 05 Jan 2008 12:33:21 +0100 test: redirect all "cd -" output to /dev/null
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Jan 2008 12:33:21 +0100] rev 325
test: redirect all "cd -" output to /dev/null
Fri, 04 Jan 2008 17:27:37 +0100 (0.9.2compat) add rejecttest as comment, as it is not working in this branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:27:37 +0100] rev 324
(0.9.2compat) add rejecttest as comment, as it is not working in this branch
Fri, 04 Jan 2008 17:23:13 +0100 test: rename (misleading) conflicttest to rejecttest
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:23:13 +0100] rev 323
test: rename (misleading) conflicttest to rejecttest
Fri, 04 Jan 2008 17:16:13 +0100 (0.9.2compat) get backwards compatible changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:16:13 +0100] rev 322
(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.
Fri, 04 Jan 2008 16:56:26 +0100 README: fix help instruction
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 16:56:26 +0100] rev 321
README: fix help instruction Spotted by Thomas Arendsen Hein.
Wed, 02 Jan 2008 16:42:17 +0100 Compress kwfstats intitialization
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Jan 2008 16:42:17 +0100] rev 320
Compress kwfstats intitialization
Wed, 02 Jan 2008 16:31:49 +0100 Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Jan 2008 16:31:49 +0100] rev 319
Always opts.get to be on safe side
Tue, 01 Jan 2008 19:16:13 +0100 Make command line check even more private
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jan 2008 19:16:13 +0100] rev 318
Make command line check even more private
Sat, 29 Dec 2007 18:45:47 +0100 Turn patch.patchfile.__init__ monkeypatch into a wrapper
Christian Ebert <blacktrash@gmx.net> [Sat, 29 Dec 2007 18:45:47 +0100] rev 317
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.
Fri, 21 Dec 2007 00:42:09 +0100 Test potential import conflict
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Dec 2007 00:42:09 +0100] rev 316
Test potential import conflict
Fri, 21 Dec 2007 00:40:25 +0100 Avoid import and merge conflicts caused by expanded keywords
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Dec 2007 00:40:25 +0100] rev 315
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.
Thu, 20 Dec 2007 22:15:43 +0100 Do not pass global _kwtemplater around in arguments
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Dec 2007 22:15:43 +0100] rev 314
Do not pass global _kwtemplater around in arguments
Thu, 20 Dec 2007 17:08:43 +0100 Remove spurious echo from test
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Dec 2007 17:08:43 +0100] rev 313
Remove spurious echo from test
Mon, 17 Dec 2007 16:43:26 +0100 (0.9.2compat) use updated fancyopts from 88803a69b24a 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 17 Dec 2007 16:43:26 +0100] rev 312
(0.9.2compat) use updated fancyopts from 88803a69b24a
Tue, 04 Dec 2007 09:56:12 +0100 (0.9.2compat) implement context based changes from default branch 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Dec 2007 09:56:12 +0100] rev 311
(0.9.2compat) implement context based changes from default branch NOTE: Interrupted commit is broken with versions < 0.9.5! Leave tests outcommented.
Sun, 02 Dec 2007 08:32:19 +0100 Reintroduce _iskwfile with link method as argument
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Dec 2007 08:32:19 +0100] rev 310
Reintroduce _iskwfile with link method as argument Rename kwtemplater.match to matcher analogous to util.matcher.
Sun, 02 Dec 2007 08:15:36 +0100 Make path format output switches more compact
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Dec 2007 08:15:36 +0100] rev 309
Make path format output switches more compact
Sun, 02 Dec 2007 08:00:31 +0100 Set kwtemplater.path at kwfilelog initialization
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Dec 2007 08:00:31 +0100] rev 308
Set kwtemplater.path at kwfilelog initialization
Sat, 01 Dec 2007 20:31:13 +0100 Refactor to initialize kwtemplater only once during reposetup
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 20:31:13 +0100] rev 307
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.
Sat, 01 Dec 2007 13:15:13 +0100 Rename kwtemplater.t to kwtemplater.ct
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 13:15:13 +0100] rev 306
Rename kwtemplater.t to kwtemplater.ct
Sat, 01 Dec 2007 10:32:40 +0100 Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 10:32:40 +0100] rev 305
Test that commit hooks are not run on interrupted commit
Sat, 01 Dec 2007 09:52:00 +0100 Do not run commit hooks if there is no node
Christian Ebert <blacktrash@gmx.net> [Sat, 01 Dec 2007 09:52:00 +0100] rev 304
Do not run commit hooks if there is no node Eg. when commit is interrupted.
(0) -300 -100 -60 +60 +100 +300 +1000 tip