equal
deleted
inserted
replaced
17 error, |
17 error, |
18 policy, |
18 policy, |
19 pycompat, |
19 pycompat, |
20 util, |
20 util, |
21 ) |
21 ) |
|
22 from .utils import dateutil |
22 |
23 |
23 _missing_newline_marker = "\\ No newline at end of file\n" |
24 _missing_newline_marker = "\\ No newline at end of file\n" |
24 |
25 |
25 bdiff = policy.importmod(r'bdiff') |
26 bdiff = policy.importmod(r'bdiff') |
26 mpatch = policy.importmod(r'mpatch') |
27 mpatch = policy.importmod(r'mpatch') |
253 aprefix = bprefix = '' |
254 aprefix = bprefix = '' |
254 else: |
255 else: |
255 aprefix = 'a/' |
256 aprefix = 'a/' |
256 bprefix = 'b/' |
257 bprefix = 'b/' |
257 |
258 |
258 epoch = util.datestr((0, 0)) |
259 epoch = dateutil.datestr((0, 0)) |
259 |
260 |
260 fn1 = util.pconvert(fn1) |
261 fn1 = util.pconvert(fn1) |
261 fn2 = util.pconvert(fn2) |
262 fn2 = util.pconvert(fn2) |
262 |
263 |
263 if binary: |
264 if binary: |