equal
deleted
inserted
replaced
94 ' log outgoing push rename rollback tip verify' |
94 ' log outgoing push rename rollback tip verify' |
95 ' convert email glog') |
95 ' convert email glog') |
96 |
96 |
97 # hg commands that trigger expansion only when writing to working dir, |
97 # hg commands that trigger expansion only when writing to working dir, |
98 # not when reading filelog, and unexpand when reading from working dir |
98 # not when reading filelog, and unexpand when reading from working dir |
99 restricted = 'record qfold qimport qnew qpush qrefresh qrecord' |
99 restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord' |
100 |
100 |
101 def utcdate(date): |
101 def utcdate(date): |
102 '''Returns hgdate in cvs-like UTC format.''' |
102 '''Returns hgdate in cvs-like UTC format.''' |
103 return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0])) |
103 return time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(date[0])) |
104 |
104 |