Mercurial > hg
comparison mercurial/merge.py @ 21264:4e932dc5c113
resolve: abort when not applicable (BC)
The resolve command is only relevant when mergestate is present.
This patch will make resolve abort when no mergestate is present.
This change will let people know when they are using resolve when they
shouldn't be. This change will let people know when their use of resolve
doesn't do anything.
Previously, |hg resolve -m| would allow mergestate to be created. This
patch now forbids that. Strictly speaking, this is backwards
incompatible. The author of this patch believes creating mergestate via
resolve doesn't make much sense and this side-effect was unintended.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Fri, 18 Apr 2014 19:08:32 -0700 |
parents | 6ca05c46aa95 |
children | 19d6fec60b81 |
comparison
equal
deleted
inserted
replaced
21263:f3e37409ecd3 | 21264:4e932dc5c113 |
---|---|
172 f.close() | 172 f.close() |
173 except IOError, err: | 173 except IOError, err: |
174 if err.errno != errno.ENOENT: | 174 if err.errno != errno.ENOENT: |
175 raise | 175 raise |
176 return records | 176 return records |
177 | |
178 def active(self): | |
179 """Whether mergestate is active. | |
180 | |
181 Returns True if there appears to be mergestate. This is a rough proxy | |
182 for "is a merge in progress." | |
183 """ | |
184 # Check local variables before looking at filesystem for performance | |
185 # reasons. | |
186 return bool(self._local) or bool(self._state) or \ | |
187 self._repo.opener.exists(self.statepathv1) or \ | |
188 self._repo.opener.exists(self.statepathv2) | |
177 | 189 |
178 def commit(self): | 190 def commit(self): |
179 """Write current state on disk (if necessary)""" | 191 """Write current state on disk (if necessary)""" |
180 if self._dirty: | 192 if self._dirty: |
181 records = [] | 193 records = [] |