equal
deleted
inserted
replaced
105 if not fuzz: |
105 if not fuzz: |
106 ui.warn(_("module 'fuzzywuzzy' not found, merging of similar " |
106 ui.warn(_("module 'fuzzywuzzy' not found, merging of similar " |
107 "releasenotes is disabled\n")) |
107 "releasenotes is disabled\n")) |
108 |
108 |
109 for section in other: |
109 for section in other: |
110 existingnotes = converttitled(self.titledforsection(section)) + \ |
110 existingnotes = ( |
111 convertnontitled(self.nontitledforsection(section)) |
111 converttitled(self.titledforsection(section)) + |
|
112 convertnontitled(self.nontitledforsection(section))) |
112 for title, paragraphs in other.titledforsection(section): |
113 for title, paragraphs in other.titledforsection(section): |
113 if self.hastitledinsection(section, title): |
114 if self.hastitledinsection(section, title): |
114 # TODO prompt for resolution if different and running in |
115 # TODO prompt for resolution if different and running in |
115 # interactive mode. |
116 # interactive mode. |
116 ui.write(_('%s already exists in %s section; ignoring\n') % |
117 ui.write(_('%s already exists in %s section; ignoring\n') % |