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