Christian Ebert <blacktrash@gmx.net> [Fri, 06 Jun 2008 17:08:56 +0200] rev 457
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
Christian Ebert <blacktrash@gmx.net> [Sun, 01 Jun 2008 13:35:12 +0200] rev 456
keyword: use dirstate.parents to obtain current first parent
This should be quicker than changectx().node()
Christian Ebert <blacktrash@gmx.net> [Sun, 01 Jun 2008 23:47:32 +0200] rev 455
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.
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:47:38 +0200] rev 454
(stable) merge with default to fix import from crew
1 hunk that removed "files" argument from patch.diff forgotten by me.
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:25:52 +0200] rev 453
Incorporate latest changes in backwards compatible way
Christian Ebert <blacktrash@gmx.net> [Wed, 14 May 2008 02:24:40 +0200] rev 452
Fix arguments for patch.diff monkey
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:33:23 +0200] rev 451
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 May 2008 08:32:01 +0200] rev 450
(stable) ignore .DS_Store
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 449
match: remove files arg from repo.status and friends
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 448
match: remove files argument from patch.diff
[ original message from upstream ]
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 447
walk: remove remaining users of cmdutils.matchpats
[ original message from upstream ]
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:48:29 +0200] rev 446
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Apr 2008 01:46:06 +0200] rev 445
(stable) patches from default in 4b2c266bf059
Revert to util.binary, as checks entire data for \0 now.
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