##// END OF EJS Templates
mq: update to handle repomap not longer used
Vadim Gelfer -
r2725:9ffee4f0 default
parent child Browse files
Show More
@@ -1195,9 +1195,8 b' def clone(ui, source, dest=None, **opts)'
1195 qbase, destrev = None, None
1195 qbase, destrev = None, None
1196 if sr.local():
1196 if sr.local():
1197 reposetup(ui, sr)
1197 reposetup(ui, sr)
1198 sq = repomap[sr]
1198 if sr.mq.applied:
1199 if sq.applied:
1199 qbase = revlog.bin(sr.mq.applied[0].split(':')[0])
1200 qbase = revlog.bin(sq.applied[0].split(':')[0])
1201 if not hg.islocal(dest):
1200 if not hg.islocal(dest):
1202 destrev = sr.parents(qbase)[0]
1201 destrev = sr.parents(qbase)[0]
1203 ui.note(_('cloning main repo\n'))
1202 ui.note(_('cloning main repo\n'))
@@ -1216,8 +1215,7 b' def clone(ui, source, dest=None, **opts)'
1216 if qbase:
1215 if qbase:
1217 ui.note(_('stripping applied patches from destination repo\n'))
1216 ui.note(_('stripping applied patches from destination repo\n'))
1218 reposetup(ui, dr)
1217 reposetup(ui, dr)
1219 dq = repomap[dr]
1218 dr.mq.strip(dr, qbase, update=False, backup=None)
1220 dq.strip(dr, qbase, update=False, backup=None)
1221 if not opts['noupdate']:
1219 if not opts['noupdate']:
1222 ui.note(_('updating destination repo\n'))
1220 ui.note(_('updating destination repo\n'))
1223 dr.update(dr.changelog.tip())
1221 dr.update(dr.changelog.tip())
General Comments 0
You need to be logged in to leave comments. Login now