18 from hgweb import server as hgweb_server |
18 from hgweb import server as hgweb_server |
19 import merge as mergemod |
19 import merge as mergemod |
20 import minirst, revset, fileset |
20 import minirst, revset, fileset |
21 import dagparser, context, simplemerge, graphmod, copies |
21 import dagparser, context, simplemerge, graphmod, copies |
22 import random, operator |
22 import random, operator |
23 import setdiscovery, treediscovery, dagutil, pvec, localrepo |
23 import setdiscovery, treediscovery, dagutil, pvec, localrepo, destutil |
24 import phases, obsolete, exchange, bundle2, repair, lock as lockmod |
24 import phases, obsolete, exchange, bundle2, repair, lock as lockmod |
25 import ui as uimod |
25 import ui as uimod |
26 |
26 |
27 table = {} |
27 table = {} |
28 |
28 |
6595 |
6595 |
6596 if check: |
6596 if check: |
6597 cmdutil.bailifchanged(repo, merge=False) |
6597 cmdutil.bailifchanged(repo, merge=False) |
6598 if rev is None: |
6598 if rev is None: |
6599 rev = repo[repo[None].branch()].rev() |
6599 rev = repo[repo[None].branch()].rev() |
|
6600 elif rev is None: |
|
6601 rev = destutil.destupdate(repo, clean=clean) |
6600 |
6602 |
6601 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
6603 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
6602 |
6604 |
6603 if clean: |
6605 if clean: |
6604 ret = hg.clean(repo, rev) |
6606 ret = hg.clean(repo, rev) |