equal
deleted
inserted
replaced
5662 if check: |
5662 if check: |
5663 # we could use dirty() but we can ignore merge and branch trivia |
5663 # we could use dirty() but we can ignore merge and branch trivia |
5664 c = repo[None] |
5664 c = repo[None] |
5665 if c.modified() or c.added() or c.removed(): |
5665 if c.modified() or c.added() or c.removed(): |
5666 raise util.Abort(_("uncommitted local changes")) |
5666 raise util.Abort(_("uncommitted local changes")) |
5667 if not rev: |
5667 if rev is None: |
5668 rev = repo[repo[None].branch()].rev() |
5668 rev = repo[repo[None].branch()].rev() |
5669 mergemod._checkunknown(repo, repo[None], repo[rev]) |
5669 mergemod._checkunknown(repo, repo[None], repo[rev]) |
5670 |
5670 |
5671 if clean: |
5671 if clean: |
5672 ret = hg.clean(repo, rev) |
5672 ret = hg.clean(repo, rev) |