equal
deleted
inserted
replaced
204 if srcauthor in self.authors and dstauthor != self.authors[srcauthor]: |
204 if srcauthor in self.authors and dstauthor != self.authors[srcauthor]: |
205 self.ui.status( |
205 self.ui.status( |
206 _('Overriding mapping for author %s, was %s, will be %s\n') |
206 _('Overriding mapping for author %s, was %s, will be %s\n') |
207 % (srcauthor, self.authors[srcauthor], dstauthor)) |
207 % (srcauthor, self.authors[srcauthor], dstauthor)) |
208 else: |
208 else: |
209 self.ui.debug(_('Mapping author %s to %s\n') |
209 self.ui.debug(_('mapping author %s to %s\n') |
210 % (srcauthor, dstauthor)) |
210 % (srcauthor, dstauthor)) |
211 self.authors[srcauthor] = dstauthor |
211 self.authors[srcauthor] = dstauthor |
212 except IndexError: |
212 except IndexError: |
213 self.ui.warn( |
213 self.ui.warn( |
214 _('Ignoring bad line in author map file %s: %s\n') |
214 _('Ignoring bad line in author map file %s: %s\n') |