Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 13:40:16 +0200] rev 444
(0.9.2compat) backwards compatible changes from default
uisetup was introduced after 0.9.3, so not used.
Therefore different handling of monkeypatches.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 09:13:17 +0200] rev 443
Reduce opt=arg syntax even more
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 00:55:21 +0200] rev 442
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.
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 441
Make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 440
Compact argument passing to wrapped methods
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 18:46:48 +0200] rev 439
Privatize remaining monkeypatches by moving them into reposetup
Make it more transparent if and when monkeypatches are needed.
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 14:05:20 +0200] rev 438
Collect filename patterns, wrap dispatch._parse in uisetup
Store [keyword] config in kwtools.
hgcmd defaults to empty string.
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 13:41:04 +0200] rev 437
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 11:03:23 +0200] rev 436
Adapt to new webcommands with "clean" monkey patches
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 10:50:10 +0200] rev 435
(0.9.2compat) fix and simplify webcommands monkey
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 18:25:25 +0200] rev 434
(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.
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 17:13:02 +0200] rev 433
(0.9.2compat) fix webcommand monkey patches, and adapt to most recent changes
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Mar 2008 17:04:37 +0200] rev 432
(0.9.2compat) no conditional for web file match disabling
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 19:40:44 +0100] rev 431
hgweb: refactor hgweb code
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Mar 2008 13:34:56 +0100] rev 430
Merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 18:33:10 +0100] rev 429
tests: add tests for hgweb to test-keyword
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Mar 2008 15:38:02 +0100] rev 428
Merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 21 Mar 2008 14:52:24 +0100] rev 427
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 ]
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 14:14:15 -0500] rev 426
tests: remove some unnecessary sleeps
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:55:38 +0100] rev 425
Ignore .DS_Store
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Mar 2008 23:54:10 +0100] rev 424
(0.9.2compat) ignore .DS_Store
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:21:34 +0100] rev 423
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Mar 2008 02:17:21 +0100] rev 422
(0.9.2compat) expand * import
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:26 +0100] rev 421
Expand import * to allow Pyflakes to find problems
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Feb 2008 14:23:48 +0100] rev 420
(0.9.2compat) get fix from stable branch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Feb 2008 16:22:31 -0300] rev 419
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 ]
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:18:56 +0100] rev 418
Merge stable with default
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 20:17:33 +0100] rev 417
(0.9.2compat) incorporate changes from default branch
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:57:45 +0100] rev 416
Rename kwx to kwtools
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Feb 2008 17:54:58 +0100] rev 415
Fix getnode doc, add doc for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:55:49 +0100] rev 414
(0.9.2compat) FIX typo in hgweb monkeys
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:50:00 +0100] rev 413
Remove whitespace at eol
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 18:49:21 +0100] rev 412
(0.9.2compat) remove whitespace at eol
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 15:55:21 +0100] rev 411
(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.
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 16:11:54 +0100] rev 410
Do not inspect node1 for diff if node2 is given
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:30:17 +0100] rev 409
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:26:51 +0100] rev 408
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.
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 13:20:16 +0100] rev 407
Move expand/shrink decisions into kwtemplater
- do not clobber wrapper code
- get rid of clumsy kwtemplater attributes
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:38:28 +0100] rev 406
Remove obsolete variable declaration
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Feb 2008 01:22:22 +0100] rev 405
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Feb 2008 23:49:57 +0100] rev 404
Monkeypatch patch.diff for non-interactive diffs
Avoid clobbering diffs with expanded keywords eg. for
notify extension.
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 23:09:53 +0100] rev 403
(stable) merge with default branch
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:38:30 +0100] rev 402
(0.9.2compat) add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:37:13 +0100] rev 401
Add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 17:09:22 +0100] rev 400
(0.9.2compat) use different names for web methods
Makes it clearer that these are not redefinitions of the same
methods.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 14:57:48 +0100] rev 399
(0.9.2compat) web as in default where possible
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 08:35:55 +0100] rev 398
Switch off expansion for web diffs
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 01:28:16 +0100] rev 397
(0.9.2compat) incorporate changes from default branch
_iskwfile used by 2 functions again.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:32:14 +0100] rev 396
Make restrict entirely a kwtemplater attribute
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:15:03 +0100] rev 395
keyword: declare globals in a more compact way
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 00:13:57 +0100] rev 394
keyword: avoid os import by using util.splitpath
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:17:31 +0100] rev 393
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:09 +0100] rev 392
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 ]
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:06 +0100] rev 391
keyword: fix symlink detection under Windows
[ original upstream description ]
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 19:40:30 +0100] rev 390
keyword: fix mq repository detection under Windows
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:42:00 +0100] rev 389
(stable) merge with default branch
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 09:31:13 +0100] rev 388
(0.9.2compat) make patchfile monkey work with 0.9.5
Christian Ebert <blacktrash@gmx.net> [Fri, 08 Feb 2008 10:14:47 +0100] rev 387
(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.
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 15:13:37 +0100] rev 386
Ignore everything starting with .hg
Tough luck for those who want keywords in .hgignore ;)
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 10:32:05 +0100] rev 385
Monkeypatch dispatch._parse to avoid running it twice
Inspired by Thomas Arendsen Hain.
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 01:49:17 +0100] rev 384
Do not set up kwrepo when pulling from bundlerepo
Spotted and test case provided by pmezard.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 23:32:21 +0100] rev 383
Fix pychecker warning about shadowed variable
Also no underscore prefix for restrict inside reposetup.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 22:26:50 +0100] rev 382
Safeguard anything under .hg, and the .hg_archival.txt file
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:46:49 +0100] rev 381
Prevent expansion in queue repo and for email
Saveguard needed for global [keyword] filename patterns.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:38:14 +0100] rev 380
(0.9.2compat) discard wread/wwrite approach
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 18:35:16 +0100] rev 379
(0.9.2compat) get changes from stable branch
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 17:25:37 +0100] rev 378
Discard wread/wwrite approach, merge with stable
A basic "hg update" did not give correct results.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 11:32:34 +0100] rev 377
Fix filewise expansion for hgweb
Also make changectx argument to kwtemplater.expand.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 00:24:49 +0100] rev 376
Test unbundle null revision containing empty symlink
Spotted by pmezard.
Matt Mackall <mpm@selenic.com> [Tue, 05 Feb 2008 16:09:21 -0600] rev 375
keyword: fix my string pasting thinko
Spotted by Maxim Dounin
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:40:32 +0100] rev 374
Make nokwcommands, restricted string variables at top level
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:38:00 +0100] rev 373
Split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:36:23 +0100] rev 372
Add empty_ok argument to kwrepo.commit
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 18:33:55 +0100] rev 371
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?
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 17:23:24 +0100] rev 370
(0.9.2compat) expand keywords in raw web output, and other changes from default branch
Comment out import related tests, as not always available.
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 16:22:40 +0100] rev 369
Remove obsolete test message
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 16:13:15 +0100] rev 368
Fix web output: expand to requested rev; kwcat: wrap cat, avoid filelog subclass
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 12:22:48 +0100] rev 367
Expand keywords in hgweb rawfile output
Christian Ebert <blacktrash@gmx.net> [Thu, 31 Jan 2008 01:06:49 +0100] rev 366
(0.9.2compat) use templatefilters module if available; bail out in mq dir
Revert to always using full definition of repo._link.
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Feb 2008 08:04:50 +0100] rev 365
Disable expansion in mq directory; add test for qcommit
There might still be problems with qsave copied patch queues.
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Feb 2008 00:48:37 +0100] rev 364
Adapt to templatefilters module splitoff
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 ]
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 ]
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Feb 2008 08:16:56 +0100] rev 361
stable branch: reflects latest Mercurial upstream state
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.
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
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jan 2008 01:24:10 +0100] rev 358
Handle LookupError eg. for hg convert
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 21:15:57 +0100] rev 357
Add empty_ok argument to commit
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:33:00 +0100] rev 356
Update test using kwcat
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:25 +0100] rev 355
Implement kwcat command
Christian Ebert <blacktrash@gmx.net> [Tue, 29 Jan 2008 17:32:15 +0100] rev 354
Make kwtemplater kwrepo attribute instead of global variable
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.
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
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.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 12:33:24 +0100] rev 350
(0.9.2compat) implement external call handle and hook
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.
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 11:38:22 +0100] rev 348
Get changes from default branch; update test output
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Jan 2008 11:36:37 +0100] rev 347
Detect restricted commands thru variable
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)
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