Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 42536:5f2f6912c9e6
states: moved cmdutil.unfinishedstates to state.py
This moves `cmdutil.unfinishedstates`, `checkunfinished()`,`clearunfinished()`
to `state.py`. the already existing users of this module are updated accordingly.
Test results remain unchanged.
Differential Revision: https://phab.mercurial-scm.org/D6484
| author | Taapas Agrawal <taapas2897@gmail.com> |
|---|---|
| date | Sat, 08 Jun 2019 23:43:53 +0530 |
| parents | a68350a7fc55 |
| children | 3de4f17f4824 |
comparison
equal
deleted
inserted
replaced
| 42535:e079e001d536 | 42536:5f2f6912c9e6 |
|---|---|
| 6146 elif merge: | 6146 elif merge: |
| 6147 updatecheck = 'none' | 6147 updatecheck = 'none' |
| 6148 | 6148 |
| 6149 with repo.wlock(): | 6149 with repo.wlock(): |
| 6150 cmdutil.clearunfinished(repo) | 6150 cmdutil.clearunfinished(repo) |
| 6151 | |
| 6152 if date: | 6151 if date: |
| 6153 rev = cmdutil.finddate(ui, repo, date) | 6152 rev = cmdutil.finddate(ui, repo, date) |
| 6154 | 6153 |
| 6155 # if we defined a bookmark, we have to remember the original name | 6154 # if we defined a bookmark, we have to remember the original name |
| 6156 brev = rev | 6155 brev = rev |