Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 10:02:57 +0100] rev 345
bugfix: avoid expansion with qfold
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>
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.
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jan 2008 11:22:16 +0100] rev 342
Add a very simple mq test
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.
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.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Jan 2008 15:21:57 +0100] rev 339
(0.9.2compat) get changes from default branch
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Jan 2008 15:12:20 +0100] rev 338
Merge Solaris test compatibility
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.
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.
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Jan 2008 14:41:22 +0100] rev 335
Fix some doc strings; update copyright
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
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).
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jan 2008 12:52:59 +0100] rev 332
(0.9.2compat) Get bugfix from default branch
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.
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>".
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 12:02:23 +0100] rev 329
(0.9.2compat) obtain simplifications from default branch
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
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Jan 2008 11:27:41 +0100] rev 327
Simplify temporary ui.quiet setting in kwdemo
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
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Jan 2008 12:33:21 +0100] rev 325
test: redirect all "cd -" output to /dev/null
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
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 17:23:13 +0100] rev 323
test: rename (misleading) conflicttest to rejecttest
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.
Christian Ebert <blacktrash@gmx.net> [Fri, 04 Jan 2008 16:56:26 +0100] rev 321
README: fix help instruction
Spotted by Thomas Arendsen Hein.
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Jan 2008 16:42:17 +0100] rev 320
Compress kwfstats intitialization
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Jan 2008 16:31:49 +0100] rev 319
Always opts.get to be on safe side
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jan 2008 19:16:13 +0100] rev 318
Make command line check even more private
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.
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Dec 2007 00:42:09 +0100] rev 316
Test potential import conflict
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.
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Dec 2007 22:15:43 +0100] rev 314
Do not pass global _kwtemplater around in arguments