Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/mq.py @ 4008:6e0cb0790e23
mq: fix strip failing to unlink a bundle
os.unlink doesn't know how to deal with urls
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 26 Dec 2006 21:57:20 +0100 |
parents | 733d56b8830f |
children | a195f11ed1a2 8ee983e3d461 |
comparison
equal
deleted
inserted
replaced
3988:9dcf9d45cab8 | 4008:6e0cb0790e23 |
---|---|
700 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') | 700 backupch = repo.changegroupsubset([rev], chlog.heads(), 'strip') |
701 bundle(backupch) | 701 bundle(backupch) |
702 if saveheads: | 702 if saveheads: |
703 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') | 703 backupch = repo.changegroupsubset(savebases.keys(), saveheads, 'strip') |
704 chgrpfile = bundle(backupch) | 704 chgrpfile = bundle(backupch) |
705 chgrpfile = 'file:%s' % chgrpfile | |
706 | 705 |
707 stripall(rev, revnum) | 706 stripall(rev, revnum) |
708 | 707 |
709 change = chlog.read(rev) | 708 change = chlog.read(rev) |
710 chlog.strip(revnum, revnum) | 709 chlog.strip(revnum, revnum) |
711 repo.manifest.strip(repo.manifest.rev(change[0]), revnum) | 710 repo.manifest.strip(repo.manifest.rev(change[0]), revnum) |
712 if saveheads: | 711 if saveheads: |
713 self.ui.status("adding branch\n") | 712 self.ui.status("adding branch\n") |
714 commands.unbundle(self.ui, repo, chgrpfile, update=False) | 713 commands.unbundle(self.ui, repo, "file:%s" % chgrpfile, |
714 update=False) | |
715 if backup != "strip": | 715 if backup != "strip": |
716 os.unlink(chgrpfile) | 716 os.unlink(chgrpfile) |
717 | 717 |
718 def isapplied(self, patch): | 718 def isapplied(self, patch): |
719 """returns (index, rev, patch)""" | 719 """returns (index, rev, patch)""" |