Christian Ebert <blacktrash@gmx.net> [Sun, 06 Jun 2010 20:19:24 +0100] rev 760
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Jun 2010 10:37:31 +0100] rev 759
Use context to detect uncommitted merge
Christian Ebert <blacktrash@gmx.net> [Sat, 22 May 2010 14:10:49 +0200] rev 758
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 757
Offer svn-like default keywordmaps
svn-like default keywords can be set in a new configuration section
called [keywordset] -- thanks to timeless for the name.
Move setup of default keywordmaps into dedicated function used by
kwtemplater.__init__ and demo.
HeadURL/URL is not supported (by default).
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 756
Add 2 svn-like date filters
svnisodate yields the format the date in svn's Id keyword expands to.
svnutcdate yields the format svn's Date/LastChangedDate expands to.
http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
Christian Ebert <blacktrash@gmx.net> [Tue, 18 May 2010 22:22:59 +0200] rev 755
Merge with stable
Martin Geisler <mg@aragost.com> [Tue, 18 May 2010 16:31:10 +0200] rev 754
Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 17:15:38 +0200] rev 753
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 752
rollback: fix up tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 10:56:47 +0200] rev 751
(stable) merge
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 17:24:21 -0500] rev 750
commit: note new branch heads rather than topological heads
Move to using contexts while we're at it.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 09 May 2010 11:14:43 +0200] rev 749
Support extensions using dorecord, e.g. crecord
Provide extendable keyword.recordextensions variable, so other
extensions beside hgext.record which provide the dorecord function
can cooperate with hgext.keyword like so (example from crecord):
def extsetup():
try:
keyword = extensions.find('keyword')
keyword.restricted += ' crecord qcrecord'
try:
# use record support in keyword.py if present
keyword.recordcommands += ' crecord qcrecord'
keyword.recordextensions += ' crecord'
except AttributeError:
pass
except KeyError:
pass
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 17:16:00 +0200] rev 748
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 14:02:45 +0200] rev 747
Omit setting extra variable for record context
Since dc2f37864348 the context is always retrieved in
kwtemplater.overwrite().
Christian Ebert <blacktrash@gmx.net> [Tue, 04 May 2010 01:15:34 +0200] rev 746
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sun, 02 May 2010 22:39:43 +0200] rev 745
Simplify record switch in kwtemplater.overwrite
1) use kwtemplater.record attribute for clarity
2) drop optional context argument; consider the speed loss by
duplicating the dictionary lookup repo['.'] as negligible
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:18:42 +0200] rev 744
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 20:49:40 +0200] rev 743
Cleanup test and make it portable
- replace sed call with python command
- no need to back up hgrc before record
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 16:30:09 +0200] rev 742
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 741
run-tests: add --view switch to use external diff viewer
[original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 740
run-tests: sort options
[original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 739
run-tests: add -l short option for --local
[original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 15:21:59 +0200] rev 738
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 737
Test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 736
Support (q)record
Monkeypatch hgext.dorecord to trigger keyword expansion.
Read data from working directory, not from filelog.
Prevent keyword expansion from within record's commitfunc,
thereby fixing a bug/inconsistency where files which are clean
after recording were overwritten twice.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 735
Remove mq commands from restricted list
Monkeypatching patch.diff takes care of this since 911f5be5d159.
Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 734
Replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net> [Fri, 23 Apr 2010 10:37:08 +0200] rev 733
Merge with stable