Show More
@@ -832,7 +832,7 def _computedivergentset(repo): | |||
|
832 | 832 | return divergent |
|
833 | 833 | |
|
834 | 834 | |
|
835 | def createmarkers(repo, relations, flag=0, metadata=None): | |
|
835 | def createmarkers(repo, relations, flag=0, date=None, metadata=None): | |
|
836 | 836 | """Add obsolete markers between changesets in a repo |
|
837 | 837 | |
|
838 | 838 | <relations> must be an iterable of (<old>, (<new>, ...)[,{metadata}]) |
@@ -851,8 +851,6 def createmarkers(repo, relations, flag= | |||
|
851 | 851 | # prepare metadata |
|
852 | 852 | if metadata is None: |
|
853 | 853 | metadata = {} |
|
854 | if 'date' not in metadata: | |
|
855 | metadata['date'] = '%i %i' % util.makedate() | |
|
856 | 854 | if 'user' not in metadata: |
|
857 | 855 | metadata['user'] = repo.ui.username() |
|
858 | 856 | tr = repo.transaction('add-obsolescence-marker') |
@@ -871,7 +869,7 def createmarkers(repo, relations, flag= | |||
|
871 | 869 | nsucs = tuple(s.node() for s in sucs) |
|
872 | 870 | if nprec in nsucs: |
|
873 | 871 | raise util.Abort("changeset %s cannot obsolete itself" % prec) |
|
874 | repo.obsstore.create(tr, nprec, nsucs, flag, | |
|
872 | repo.obsstore.create(tr, nprec, nsucs, flag, date=date, | |
|
875 | 873 | metadata=localmetadata) |
|
876 | 874 | repo.filteredrevcache.clear() |
|
877 | 875 | tr.close() |
General Comments 0
You need to be logged in to leave comments.
Login now