Mercurial > hg-stable
view tests/fakepatchtime.py @ 44414:218feb1a7e00
graft: always allow hg graft --base . (issue6248)
`hg graft --base . -r abc` is rejected before this change with a
"nothing to merge" error, if `abc` does not descend from `.`.
This looks like an artifact of the implementation rather than intended
behavior. It makes perfect sense to apply the diff between `.` and
`abc` to the working copy (i.e. degenerate into `hg revert`),
regardless of what `abc` is.
Differential Revision: https://phab.mercurial-scm.org/D8127
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Mon, 17 Feb 2020 20:30:03 -0500 |
parents | 2372284d9457 |
children | 89a2afe31e82 |
line wrap: on
line source
# extension to emulate invoking 'patch.internalpatch()' at the time # specified by '[fakepatchtime] fakenow' from __future__ import absolute_import from mercurial import ( extensions, patch as patchmod, registrar, ) from mercurial.utils import dateutil configtable = {} configitem = registrar.configitem(configtable) configitem( b'fakepatchtime', b'fakenow', default=None, ) def internalpatch( orig, ui, repo, patchobj, strip, prefix=b'', files=None, eolmode=b'strict', similarity=0, ): if files is None: files = set() r = orig( ui, repo, patchobj, strip, prefix=prefix, files=files, eolmode=eolmode, similarity=similarity, ) fakenow = ui.config(b'fakepatchtime', b'fakenow') if fakenow: # parsing 'fakenow' in YYYYmmddHHMM format makes comparison between # 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy fakenow = dateutil.parsedate(fakenow, [b'%Y%m%d%H%M'])[0] for f in files: repo.wvfs.utime(f, (fakenow, fakenow)) return r def extsetup(ui): extensions.wrapfunction(patchmod, 'internalpatch', internalpatch)