Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/mdiff.py @ 36636:c6061cadb400
util: extract all date-related utils in utils/dateutil module
With this commit, util.py lose 262 lines
Note for extensions author, if this commit breaks your extension, you can pull
the step-by-step split here to help you more easily pinpoint the renaming that
broke your extension:
hg pull https://bitbucket.org/octobus/mercurial-devel/ -r ac1f6453010d
Differential Revision: https://phab.mercurial-scm.org/D2282
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 15 Feb 2018 17:18:26 +0100 |
| parents | 44c4a38bf563 |
| children | edd3974bd500 |
comparison
equal
deleted
inserted
replaced
| 36635:4de15c54e59f | 36636:c6061cadb400 |
|---|---|
| 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: |