equal
deleted
inserted
replaced
170 # fake file name |
170 # fake file name |
171 basename = "changeset-description" |
171 basename = "changeset-description" |
172 succname = "changeset-description" |
172 succname = "changeset-description" |
173 |
173 |
174 d = compat.strdiff(basedesc, succdesc, basename, succname) |
174 d = compat.strdiff(basedesc, succdesc, basename, succname) |
175 # mercurial 4.1 and before return the patch directly |
175 uheaders, hunks = d |
176 if not isinstance(d, tuple): |
176 |
177 patch = d |
177 # Copied from patch.diff |
178 else: |
178 text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) |
179 uheaders, hunks = d |
179 patch = "\n".join(uheaders + [text]) |
180 |
|
181 # Copied from patch.diff |
|
182 text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) |
|
183 patch = "\n".join(uheaders + [text]) |
|
184 |
180 |
185 return patch |
181 return patch |
186 |
182 |
187 class missingchangectx(object): |
183 class missingchangectx(object): |
188 ''' a minimal object mimicking changectx for change contexts |
184 ''' a minimal object mimicking changectx for change contexts |