spectral created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2729 AFFECTED FILES hgext/largefiles/overrides.py mercurial/cmdutil.py tests/test-rename.t CHANGE DETAILS diff --git a/tests/test-rename.t b/tests/test-rename.t --- a/tests/test-rename.t +++ b/tests/test-rename.t @@ -657,3 +657,15 @@ [255] $ hg status -C +check that stat information such as mtime is preserved - it's unclear whether +the `touch` and `stat` commands are portable, so we mimic them using python. +Not all platforms support precision of even one-second granularity, so we allow +a rather generous fudge factor here; 1234567890 is 2009, and the primary thing +we care about is that it's not the machine's current time; hopefully it's really +unlikely for a machine to have such a broken clock that this test fails. :) + + $ mkdir mtime + $ python -c 'import os; p="mtime/f"; t=1234567890; open(p, "w").close(); os.utime(p, (t, t))' + $ hg ci -qAm 'add mtime dir' + $ hg mv -q mtime mtime2 + $ python -c 'import os, sys; p="mtime2/f"; sys.exit(int(not (os.stat(p).st_mtime < 1234567999)))' diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -1186,7 +1186,7 @@ os.rename(src, tmp) os.rename(tmp, target) else: - util.copyfile(src, target) + util.copyfile(src, target, copystat=True) srcexists = True except IOError as inst: if inst.errno == errno.ENOENT: diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -667,15 +667,15 @@ try: origcopyfile = util.copyfile copiedfiles = [] - def overridecopyfile(src, dest): + def overridecopyfile(src, dest, *args, **kwargs): if (lfutil.shortname in src and dest.startswith(repo.wjoin(lfutil.shortname))): destlfile = dest.replace(lfutil.shortname, '') if not opts['force'] and os.path.exists(destlfile): raise IOError('', _('destination largefile already exists')) copiedfiles.append((src, dest)) - origcopyfile(src, dest) + origcopyfile(src, dest, *args, **kwargs) util.copyfile = overridecopyfile result += orig(ui, repo, listpats, opts, rename) To: spectral, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
