Mercurial > hg > gitweb

comparison hgext/transplant.py @ 4251:e76e52145c3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: fix ignoring empty changesets (eg after filter)
author Brendan Cully <brendan@kublai.com>
date Tue, 20 Mar 2007 13:13:39 -0700
parents e916bc0dfdd6
children
comparison
equal deleted inserted replaced
4250:ca639faa38a2 4251:e76e52145c3d
149 n = self.applyone(repo, node, source.changelog.read(node), 149 n = self.applyone(repo, node, source.changelog.read(node),
150 patchfile, merge=domerge, 150 patchfile, merge=domerge,
151 log=opts.get('log'), 151 log=opts.get('log'),
152 filter=opts.get('filter'), 152 filter=opts.get('filter'),
153 lock=lock, wlock=wlock) 153 lock=lock, wlock=wlock)
154 if domerge: 154 if n and domerge:
155 self.ui.status(_('%s merged at %s\n') % (revstr, 155 self.ui.status(_('%s merged at %s\n') % (revstr,
156 revlog.short(n))) 156 revlog.short(n)))
157 else: 157 elif n:
158 self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node), 158 self.ui.status(_('%s transplanted to %s\n') % (revlog.short(node),
159 revlog.short(n))) 159 revlog.short(n)))
160 finally: 160 finally:
161 if patchfile: 161 if patchfile:
162 os.unlink(patchfile) 162 os.unlink(patchfile)
215 try: 215 try:
216 fuzz = patch.patch(patchfile, self.ui, cwd=repo.root, 216 fuzz = patch.patch(patchfile, self.ui, cwd=repo.root,
217 files=files) 217 files=files)
218 if not files: 218 if not files:
219 self.ui.warn(_('%s: empty changeset') % revlog.hex(node)) 219 self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
220 return 220 return None
221 finally: 221 finally:
222 files = patch.updatedir(self.ui, repo, files, wlock=wlock) 222 files = patch.updatedir(self.ui, repo, files, wlock=wlock)
223 except Exception, inst: 223 except Exception, inst:
224 if filter: 224 if filter:
225 os.unlink(patchfile) 225 os.unlink(patchfile)