equal
deleted
inserted
replaced
588 cl = repo.changelog |
588 cl = repo.changelog |
589 rev = cl.rev(node) |
589 rev = cl.rev(node) |
590 parents = cl.parentrevs(rev) |
590 parents = cl.parentrevs(rev) |
591 if rev - 1 in parents: |
591 if rev - 1 in parents: |
592 # one of the parents was the old tip |
592 # one of the parents was the old tip |
593 return |
593 pass |
594 if (parents == (nullrev, nullrev) or |
594 elif (parents == (nullrev, nullrev) or |
595 len(cl.heads(cl.node(parents[0]))) > 1 and |
595 len(cl.heads(cl.node(parents[0]))) > 1 and |
596 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)): |
596 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)): |
597 ui.status(_('created new head\n')) |
597 ui.status(_('created new head\n')) |
|
598 |
|
599 if ui.debugflag: |
|
600 ui.write(_('committed changeset %d:%s\n') % (rev,hex(node))) |
|
601 elif ui.verbose: |
|
602 ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) |
598 |
603 |
599 def copy(ui, repo, *pats, **opts): |
604 def copy(ui, repo, *pats, **opts): |
600 """mark files as copied for the next commit |
605 """mark files as copied for the next commit |
601 |
606 |
602 Mark dest as having copies of source files. If dest is a |
607 Mark dest as having copies of source files. If dest is a |