comparison hgext/keyword.py @ 10117:98867145f4b5 stable

keyword: go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 23 Dec 2009 12:04:17 +0000
parents 4b514a70ea72
children 333193c025ad 25e572394f5c
comparison
equal deleted inserted replaced
10116:4b514a70ea72 10117:98867145f4b5
91 ' log outgoing push rename rollback tip verify' 91 ' log outgoing push rename rollback tip verify'
92 ' convert email glog') 92 ' convert email glog')
93 93
94 # hg commands that trigger expansion only when writing to working dir, 94 # hg commands that trigger expansion only when writing to working dir,
95 # not when reading filelog, and unexpand when reading from working dir 95 # not when reading filelog, and unexpand when reading from working dir
96 restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord' 96 restricted = ('merge record resolve qfold qimport qnew qpush qrefresh qrecord'
97 ' transplant')
97 98
98 # provide cvs-like UTC date filter 99 # provide cvs-like UTC date filter
99 utcdate = lambda x: util.datestr(x, '%Y/%m/%d %H:%M:%S') 100 utcdate = lambda x: util.datestr(x, '%Y/%m/%d %H:%M:%S')
100 101
101 # make keyword tools accessible 102 # make keyword tools accessible