equal
deleted
inserted
replaced
796 if n in parentnodes: |
796 if n in parentnodes: |
797 hg.clean(repo, state.topmost) |
797 hg.clean(repo, state.topmost) |
798 break |
798 break |
799 else: |
799 else: |
800 pass |
800 pass |
801 if supportsmarkers: |
801 cleanupnode(ui, repo, 'created', tmpnodes) |
802 obsolete.createmarkers(repo, |
802 cleanupnode(ui, repo, 'temp', leafs) |
803 ((repo[t],()) for t in sorted(tmpnodes))) |
|
804 obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(leafs))) |
|
805 else: |
|
806 cleanupnode(ui, repo, 'created', tmpnodes) |
|
807 cleanupnode(ui, repo, 'temp', leafs) |
|
808 state.clear() |
803 state.clear() |
809 return |
804 return |
810 else: |
805 else: |
811 cmdutil.checkunfinished(repo) |
806 cmdutil.checkunfinished(repo) |
812 cmdutil.bailifchanged(repo) |
807 cmdutil.bailifchanged(repo) |
897 tuple(repo[s] for s in succs))) |
892 tuple(repo[s] for s in succs))) |
898 if markers: |
893 if markers: |
899 obsolete.createmarkers(repo, markers) |
894 obsolete.createmarkers(repo, markers) |
900 else: |
895 else: |
901 cleanupnode(ui, repo, 'replaced', mapping) |
896 cleanupnode(ui, repo, 'replaced', mapping) |
902 if supportsmarkers: |
897 |
903 obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(tmpnodes))) |
898 cleanupnode(ui, repo, 'temp', tmpnodes) |
904 else: |
|
905 cleanupnode(ui, repo, 'temp', tmpnodes) |
|
906 state.clear() |
899 state.clear() |
907 if os.path.exists(repo.sjoin('undo')): |
900 if os.path.exists(repo.sjoin('undo')): |
908 os.unlink(repo.sjoin('undo')) |
901 os.unlink(repo.sjoin('undo')) |
909 |
902 |
910 def bootstrapcontinue(ui, state, opts): |
903 def bootstrapcontinue(ui, state, opts): |