Mercurial > hg
comparison hgext/transplant.py @ 11638:79231258503b stable
transplant: crash if repo.commit() finds nothing to commit
(makes issue2135, issue2264 more obvious, but does nothing to fix
either one)
This seems to happen in two distinct cases:
* patch.patch() claims success but changes nothing (e.g.
the transplanted changeset adds an empty file that already
exists)
* patch.patch() makes changes, but repo.status() fails to report them
Both of these seem like bugs in other parts of Mercurial, so arguably
it's not transplant's job to detect the failure to commit. However:
* detecting the problem as soon as possible is desirable
* it prevents a more obscure crash later, in transplants.write()
* there might be other lurking (or future) bugs that cause
repo.commit() to do nothing
Also, in the case of issue2264 (source changesets silently dropped by
transplant), the only way to spot the problem currently is the crash
in transplants.write(). Failure to transplant a patch should abort
immediately, whether it's user error (patch does not apply) or a
Mercurial bug (e.g. repo.status() failing to report changes).
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Sun, 18 Jul 2010 21:29:29 -0400 |
parents | 5834e79b24f7 |
children | a4fbbe0fbc38 |
comparison
equal
deleted
inserted
replaced
11637:64f284da1278 | 11638:79231258503b |
---|---|
244 m = match.always(repo.root, '') | 244 m = match.always(repo.root, '') |
245 else: | 245 else: |
246 m = match.exact(repo.root, '', files) | 246 m = match.exact(repo.root, '', files) |
247 | 247 |
248 n = repo.commit(message, user, date, extra=extra, match=m) | 248 n = repo.commit(message, user, date, extra=extra, match=m) |
249 if not n: | |
250 # Crash here to prevent an unclear crash later, in | |
251 # transplants.write(). This can happen if patch.patch() | |
252 # does nothing but claims success or if repo.status() fails | |
253 # to report changes done by patch.patch(). These both | |
254 # appear to be bugs in other parts of Mercurial, but dying | |
255 # here, as soon as we can detect the problem, is preferable | |
256 # to silently dropping changesets on the floor. | |
257 raise RuntimeError('nothing committed after transplant') | |
249 if not merge: | 258 if not merge: |
250 self.transplants.set(n, node) | 259 self.transplants.set(n, node) |
251 | 260 |
252 return n | 261 return n |
253 | 262 |