Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hg.py @ 46774:af7535249ea9
hg: make `clean` return consistent with the `update` function
The function return a boolean and is used as such. Lets be explicit about it.
Differential Revision: https://phab.mercurial-scm.org/D10156
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 10 Mar 2021 05:54:02 +0100 |
| parents | 66fb04552122 |
| children | e2f7b2695ba1 |
comparison
equal
deleted
inserted
replaced
| 46773:bcb5bc2d21e0 | 46774:af7535249ea9 |
|---|---|
| 1119 """forcibly switch the working directory to node, clobbering changes""" | 1119 """forcibly switch the working directory to node, clobbering changes""" |
| 1120 stats = mergemod.clean_update(repo[node]) | 1120 stats = mergemod.clean_update(repo[node]) |
| 1121 assert stats.unresolvedcount == 0 | 1121 assert stats.unresolvedcount == 0 |
| 1122 if show_stats: | 1122 if show_stats: |
| 1123 _showstats(repo, stats, quietempty) | 1123 _showstats(repo, stats, quietempty) |
| 1124 return False | |
| 1124 | 1125 |
| 1125 | 1126 |
| 1126 # naming conflict in updatetotally() | 1127 # naming conflict in updatetotally() |
| 1127 _clean = clean | 1128 _clean = clean |
| 1128 | 1129 |