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