equal
deleted
inserted
replaced
244 repo.dirstate.setparents(p1, node) |
244 repo.dirstate.setparents(p1, node) |
245 m = match.always(repo.root, '') |
245 m = match.always(repo.root, '') |
246 else: |
246 else: |
247 m = match.exact(repo.root, '', files) |
247 m = match.exact(repo.root, '', files) |
248 |
248 |
249 n = repo.commit(None, message, user, date, extra=extra, match=m) |
249 n = repo.commit(message, user, date, extra=extra, match=m) |
250 if not merge: |
250 if not merge: |
251 self.transplants.set(n, node) |
251 self.transplants.set(n, node) |
252 |
252 |
253 return n |
253 return n |
254 |
254 |
286 raise util.Abort( |
286 raise util.Abort( |
287 _('working dir not at transplant parent %s') % |
287 _('working dir not at transplant parent %s') % |
288 revlog.hex(parents[0])) |
288 revlog.hex(parents[0])) |
289 if merge: |
289 if merge: |
290 repo.dirstate.setparents(p1, parents[1]) |
290 repo.dirstate.setparents(p1, parents[1]) |
291 n = repo.commit(None, message, user, date, extra=extra) |
291 n = repo.commit(message, user, date, extra=extra) |
292 if not n: |
292 if not n: |
293 raise util.Abort(_('commit failed')) |
293 raise util.Abort(_('commit failed')) |
294 if not merge: |
294 if not merge: |
295 self.transplants.set(n, node) |
295 self.transplants.set(n, node) |
296 self.unlog() |
296 self.unlog() |