| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| from __future__ import absolute_import, print_function | from __future__ import absolute_import, print_function | ||||
| import os | import os | ||||
| from mercurial import ( | from mercurial import ( | ||||
| hg, | hg, | ||||
| merge, | merge, | ||||
| ui as uimod, | ui as uimod, | ||||
| ) | ) | ||||
| u = uimod.ui.load() | u = uimod.ui.load() | ||||
| repo = hg.repository(u, 'test1', create=1) | repo = hg.repository(u, b'test1', create=1) | ||||
| os.chdir('test1') | os.chdir('test1') | ||||
| def commit(text, time): | def commit(text, time): | ||||
| repo.commit(text=text, date="%d 0" % time) | repo.commit(text=text, date=b"%d 0" % time) | ||||
| def addcommit(name, time): | def addcommit(name, time): | ||||
| f = open(name, 'w') | f = open(name, 'w') | ||||
| f.write('%s\n' % name) | f.write(b'%s\n' % name) | ||||
| f.close() | f.close() | ||||
| repo[None].add([name]) | repo[None].add([name]) | ||||
| commit(name, time) | commit(name, time) | ||||
| def update(rev): | def update(rev): | ||||
| merge.update(repo, rev, False, True) | merge.update(repo, rev, False, True) | ||||
| def merge_(rev): | def merge_(rev): | ||||
| merge.update(repo, rev, True, False) | merge.update(repo, rev, True, False) | ||||
| if __name__ == '__main__': | if __name__ == '__main__': | ||||
| addcommit("A", 0) | addcommit(b"A", 0) | ||||
| addcommit("B", 1) | addcommit(b"B", 1) | ||||
| update(0) | update(0) | ||||
| addcommit("C", 2) | addcommit(b"C", 2) | ||||
| merge_(1) | merge_(1) | ||||
| commit("D", 3) | commit(b"D", 3) | ||||
| update(2) | update(2) | ||||
| addcommit("E", 4) | addcommit(b"E", 4) | ||||
| addcommit("F", 5) | addcommit(b"F", 5) | ||||
| update(3) | update(3) | ||||
| addcommit("G", 6) | addcommit(b"G", 6) | ||||
| merge_(5) | merge_(5) | ||||
| commit("H", 7) | commit(b"H", 7) | ||||
| update(5) | update(5) | ||||
| addcommit("I", 8) | addcommit(b"I", 8) | ||||
| # Ancestors | # Ancestors | ||||
| print('Ancestors of 5') | print('Ancestors of 5') | ||||
| for r in repo.changelog.ancestors([5]): | for r in repo.changelog.ancestors([5]): | ||||
| print(r, end=' ') | print(r, end=' ') | ||||
| print('\nAncestors of 6 and 5') | print('\nAncestors of 6 and 5') | ||||
| for r in repo.changelog.ancestors([6, 5]): | for r in repo.changelog.ancestors([6, 5]): | ||||