Mercurial > hg
comparison hgext/transplant.py @ 17320:0c3c65c0d3fc stable
transplant: fix emptied changeset message
- Append an EOL
- State the changeset is skipped
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Wed, 01 Aug 2012 14:08:19 +0200 |
| parents | a189d4470a34 |
| children | 2ba70eec1cf0 |
comparison
equal
deleted
inserted
replaced
| 17319:a189d4470a34 | 17320:0c3c65c0d3fc |
|---|---|
| 283 m = match.exact(repo.root, '', files) | 283 m = match.exact(repo.root, '', files) |
| 284 | 284 |
| 285 n = repo.commit(message, user, date, extra=extra, match=m, | 285 n = repo.commit(message, user, date, extra=extra, match=m, |
| 286 editor=self.editor) | 286 editor=self.editor) |
| 287 if not n: | 287 if not n: |
| 288 self.ui.warn(_('%s: empty changeset') % revlog.hex(node)) | 288 self.ui.warn(_('skipping emptied changeset %s\n') % short(node)) |
| 289 return None | 289 return None |
| 290 if not merge: | 290 if not merge: |
| 291 self.transplants.set(n, node) | 291 self.transplants.set(n, node) |
| 292 | 292 |
| 293 return n | 293 return n |