equal
deleted
inserted
replaced
11 |
11 |
12 from mercurial import ( |
12 from mercurial import ( |
13 commands, |
13 commands, |
14 error, |
14 error, |
15 graphmod, |
15 graphmod, |
16 mdiff, |
|
17 patch, |
16 patch, |
18 obsolete, |
17 obsolete, |
19 node as nodemod, |
18 node as nodemod, |
20 scmutil, |
19 scmutil, |
21 util, |
20 util, |
170 |
169 |
171 # fake file name |
170 # fake file name |
172 basename = "changeset-description" |
171 basename = "changeset-description" |
173 succname = "changeset-description" |
172 succname = "changeset-description" |
174 |
173 |
175 d = mdiff.unidiff(basedesc, '', succdesc, '', basename, succname) |
174 d = compat.strdiff(basedesc, succdesc, basename, succname) |
176 # mercurial 4.1 and before return the patch directly |
175 # mercurial 4.1 and before return the patch directly |
177 if not isinstance(d, tuple): |
176 if not isinstance(d, tuple): |
178 patch = d |
177 patch = d |
179 else: |
178 else: |
180 uheaders, hunks = d |
179 uheaders, hunks = d |