Show More
@@ -586,7 +586,7 def externalparent(repo, state, targetan | |||||
586 | ', '.join(str(p) for p in sorted(parents)))) |
|
586 | ', '.join(str(p) for p in sorted(parents)))) | |
587 |
|
587 | |||
588 | def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, |
|
588 | def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None, | |
589 | keepbranches=False): |
|
589 | keepbranches=False, date=None): | |
590 | '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev |
|
590 | '''Commit the wd changes with parents p1 and p2. Reuse commit info from rev | |
591 | but also store useful information in extra. |
|
591 | but also store useful information in extra. | |
592 | Return node of committed revision.''' |
|
592 | Return node of committed revision.''' | |
@@ -608,8 +608,10 def concludenode(repo, rev, p1, p2, comm | |||||
608 | if keepbranch: |
|
608 | if keepbranch: | |
609 | repo.ui.setconfig('ui', 'allowemptycommit', True) |
|
609 | repo.ui.setconfig('ui', 'allowemptycommit', True) | |
610 | # Commit might fail if unresolved files exist |
|
610 | # Commit might fail if unresolved files exist | |
|
611 | if date is None: | |||
|
612 | date = ctx.date() | |||
611 | newnode = repo.commit(text=commitmsg, user=ctx.user(), |
|
613 | newnode = repo.commit(text=commitmsg, user=ctx.user(), | |
612 |
date= |
|
614 | date=date, extra=extra, editor=editor) | |
613 | finally: |
|
615 | finally: | |
614 | repo.ui.restoreconfig(backup) |
|
616 | repo.ui.restoreconfig(backup) | |
615 |
|
617 |
General Comments 0
You need to be logged in to leave comments.
Login now