Mercurial > public > mercurial-scm > hg-stable
comparison hgext/fetch.py @ 6139:989467e8e3a9
Fix bad behaviour when specifying an invalid date (issue700)
commit (aborts _after_ typing in a commit message)
backout (aborted after the initial revert)
tag (edited .hgtags and couldn't commit)
import (patch applied, then commit fails)
qnew (aborts on bad dates, but writes any valid date into the # Date header)
qrefresh (like qnew)
sign (like tag)
fetch (merge, merge, merge, merge, abort)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 17 Feb 2008 21:34:28 +0100 |
| parents | 86f5d8f608b7 |
| children | 1f733c2f0165 |
comparison
equal
deleted
inserted
replaced
| 6138:09847b90beae | 6139:989467e8e3a9 |
|---|---|
| 63 elif opts['rev']: | 63 elif opts['rev']: |
| 64 revs = [other.lookup(rev) for rev in opts['rev']] | 64 revs = [other.lookup(rev) for rev in opts['rev']] |
| 65 modheads = repo.pull(other, heads=revs) | 65 modheads = repo.pull(other, heads=revs) |
| 66 return postincoming(other, modheads) | 66 return postincoming(other, modheads) |
| 67 | 67 |
| 68 date = opts.get('date') | |
| 69 if date: | |
| 70 opts['date'] = util.parsedate(date) | |
| 71 | |
| 68 parent, p2 = repo.dirstate.parents() | 72 parent, p2 = repo.dirstate.parents() |
| 69 if parent != repo.changelog.tip(): | 73 if parent != repo.changelog.tip(): |
| 70 raise util.Abort(_('working dir not at tip ' | 74 raise util.Abort(_('working dir not at tip ' |
| 71 '(use "hg update" to check out tip)')) | 75 '(use "hg update" to check out tip)')) |
| 72 if p2 != nullid: | 76 if p2 != nullid: |