Mercurial > hg
comparison hgext/mq.py @ 36032:f91b7f26c68a
py3: use "%d" instead of "%s" for integers
Differential Revision: https://phab.mercurial-scm.org/D2135
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 11 Feb 2018 17:25:53 +0530 |
| parents | 55e8efa2451a |
| children | c33a99506e13 |
comparison
equal
deleted
inserted
replaced
| 36031:acda1977210c | 36032:f91b7f26c68a |
|---|---|
| 1183 self.checkpatchname(name) | 1183 self.checkpatchname(name) |
| 1184 break | 1184 break |
| 1185 except error.Abort: | 1185 except error.Abort: |
| 1186 pass | 1186 pass |
| 1187 i += 1 | 1187 i += 1 |
| 1188 name = '%s__%s' % (namebase, i) | 1188 name = '%s__%d' % (namebase, i) |
| 1189 return name | 1189 return name |
| 1190 | 1190 |
| 1191 def checkkeepchanges(self, keepchanges, force): | 1191 def checkkeepchanges(self, keepchanges, force): |
| 1192 if force and keepchanges: | 1192 if force and keepchanges: |
| 1193 raise error.Abort(_('cannot use both --force and --keep-changes')) | 1193 raise error.Abort(_('cannot use both --force and --keep-changes')) |