##// END OF EJS Templates
context: write dirstate out explicitly after marking files as clean...
context: write dirstate out explicitly after marking files as clean To detect change of a file without redundant comparison of file content, dirstate recognizes a file as certainly clean, if: (1) it is already known as "normal", (2) dirstate entry for it has valid (= not "-1") timestamp, and (3) mode, size and timestamp of it on the filesystem are as same as ones expected in dirstate This works as expected in many cases, but doesn't in the corner case that changing a file keeps mode, size and timestamp of it on the filesystem. The timetable below shows steps in one of typical such situations: ---- ----------------------------------- ---------------- timestamp of "f" ---------------- dirstate file- time action mem file system ---- ----------------------------------- ---- ----- ----- N -1 *** - make file "f" clean N - execute 'hg foobar' - instantiate 'dirstate' -1 -1 - 'dirstate.normal("f")' N -1 (e.g. via dirty check) - change "f", but keep size N N+1 - release wlock - 'dirstate.write()' N N - 'hg status' shows "f" as "clean" N N N ---- ----------------------------------- ---- ----- ----- The most important point is that 'dirstate.write()' is executed at N+1 or later. This causes writing dirstate timestamp N of "f" out successfully. If it is executed at N, 'parsers.pack_dirstate()' replaces timestamp N with "-1" before actual writing dirstate out. Occasional test failure for unexpected file status is typical example of this corner case. Batch execution with small working directory is finished in no time, and rarely satisfies condition (2) above. This issue can occur in cases below; - 'hg revert --rev REV' for revisions other than the parent - failure of 'merge.update()' before 'merge.recordupdates()' The root cause of this issue is that files are changed without flushing in-memory dirstate changes via 'repo.commit()' (even though omitting 'dirstate.normallookup()' on changed files also causes this issue). To detect changes of files correctly, this patch writes in-memory dirstate changes out explicitly after marking files as clean in 'workingctx._checklookup()', which is invoked via 'repo.status()'. After this change, timetable is changed as below: ---- ----------------------------------- ---------------- timestamp of "f" ---------------- dirstate file- time action mem file system ---- ----------------------------------- ---- ----- ----- N -1 *** - make file "f" clean N - execute 'hg foobar' - instantiate 'dirstate' -1 -1 - 'dirstate.normal("f")' N -1 (e.g. via dirty check) ----------------------------------- ---- ----- ----- - 'dirsttate.write()' -1 -1 ----------------------------------- ---- ----- ----- - change "f", but keep size N N+1 - release wlock - 'dirstate.write()' -1 -1 - 'hg status' -1 -1 N ---- ----------------------------------- ---- ----- ----- To reproduce this issue in tests certainly, this patch emulates some timing critical actions as below: - timestamp of "f" in '.hg/dirstate' is -1 at the beginning 'hg debugrebuildstate' before command invocation ensures it. - make file "f" clean at N - change "f" at N 'touch -t 200001010000' before and after command invocation changes mtime of "f" to "2000-01-01 00:00" (= N). - invoke 'dirstate.write()' via 'repo.status()' at N 'fakedirstatewritetime.py' forces 'pack_dirstate()' to use "2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked via 'workingctx._checklookup()'. - invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N") 'pack_dirstate()' via releasing wlock uses actual timestamp at runtime as "now", and it should be different from the "2000-01-01 00:00" of "f". BTW, this patch also changes 'test-largefiles-misc.t', because adding 'dirstate.write()' makes recent dirstate changes visible to external process.

File last commit:

r25666:1c7e6236 default
r25753:fe03f522 default
Show More
share.py
129 lines | 4.4 KiB | text/x-python | PythonLexer
Matt Mackall
share: add experimental share extension
r8801 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
share: add experimental share extension
r8801
Cédric Duval
extensions: improve the consistency of synopses...
r8894 '''share a common history between several working directories'''
Dirkjan Ochtman
help: add/fix docstrings for a bunch of extensions
r8873
Matt Mackall
share: add experimental share extension
r8801 from mercurial.i18n import _
Ryan McElroy
share: implement shared bookmark functionality...
r23548 from mercurial import cmdutil, hg, util, extensions, bookmarks
from mercurial.hg import repository, parseurl
import errno
Simon Heimberg
hgext: introduce unshare command
r15079
Gregory Szorc
share: declare commands using decorator
r21253 cmdtable = {}
command = cmdutil.command(cmdtable)
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # Note for extension authors: ONLY specify testedwith = 'internal' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
Augie Fackler
hgext: mark all first-party extensions as such
r16743 testedwith = 'internal'
Gregory Szorc
share: declare commands using decorator
r21253 @command('share',
Yuya Nishihara
commands: replace "working copy" with "working directory" in help/messages...
r24364 [('U', 'noupdate', None, _('do not create a working directory')),
Ryan McElroy
share: add option to share bookmarks...
r23614 ('B', 'bookmarks', None, _('also share bookmarks'))],
_('[-U] [-B] SOURCE [DEST]'),
Gregory Szorc
share: define norepo in command decorator
r21772 norepo=True)
Ryan McElroy
share: add option to share bookmarks...
r23614 def share(ui, source, dest=None, noupdate=False, bookmarks=False):
Martin Geisler
share: drop experimental label...
r10798 """create a new shared repository
Matt Mackall
share: add experimental share extension
r8801
Martin Geisler
share: wrap docstrings at 70 characters
r9273 Initialize a new repository and working directory that shares its
Ryan McElroy
share: add option to share bookmarks...
r23614 history (and optionally bookmarks) with another repository.
Matt Mackall
share: add experimental share extension
r8801
Erik Zielke
Use note admonition
r12389 .. note::
Simon Heimberg
documentation: add an extra newline after note directive...
r19997
Erik Zielke
Use note admonition
r12389 using rollback or extensions that destroy/modify history (mq,
rebase, etc.) can cause considerable confusion with shared
clones. In particular, if two shared clones are both updated to
the same changeset, and one of them destroys that changeset
with rollback, the other clone will suddenly stop working: all
operations will fail with "abort: working directory has unknown
parent". The only known workaround is to use debugsetparents on
Matt Mackall
share: remove reference to tip
r19399 the broken clone to reset it to a changeset that still exists.
Matt Mackall
share: add experimental share extension
r8801 """
Ryan McElroy
share: add option to share bookmarks...
r23614 return hg.share(ui, source, dest, not noupdate, bookmarks)
Matt Mackall
share: add experimental share extension
r8801
Gregory Szorc
share: declare commands using decorator
r21253 @command('unshare', [], '')
Simon Heimberg
hgext: introduce unshare command
r15079 def unshare(ui, repo):
"""convert a shared repository to a normal one
Copy the store data to the repo and remove the sharedpath data.
"""
Angel Ezquerra
localrepo: introduce shared method to check if a repository is shared...
r23666 if not repo.shared():
Simon Heimberg
hgext: introduce unshare command
r15079 raise util.Abort(_("this is not a shared repo"))
destlock = lock = None
lock = repo.lock()
try:
# we use locks here because if we race with commit, we
# can end up with extra data in the cloned revlogs that's
# not pointed to by changesets, thus causing verify to
# fail
destlock = hg.copystore(ui, repo, repo.path)
sharefile = repo.join('sharedpath')
util.rename(sharefile, sharefile + '.old')
repo.requirements.discard('sharedpath')
repo._writerequirements()
finally:
destlock and destlock.release()
lock and lock.release()
Siddharth Agarwal
share: replace reference to 'sopener' with 'svfs'...
r25666 # update store, spath, svfs and sjoin of repo
Brodie Rao
share: fix unshare calling wrong repo.__init__() method...
r20056 repo.unfiltered().__init__(repo.baseui, repo.root)
Ryan McElroy
share: implement shared bookmark functionality...
r23548
def extsetup(ui):
extensions.wrapfunction(bookmarks.bmstore, 'getbkfile', getbkfile)
extensions.wrapfunction(bookmarks.bmstore, 'recordchange', recordchange)
extensions.wrapfunction(bookmarks.bmstore, 'write', write)
def _hassharedbookmarks(repo):
"""Returns whether this repo has shared bookmarks"""
try:
Angel Ezquerra
share: replace the bookmarks.shared file with an entry on a new "shared" file...
r23883 shared = repo.vfs.read('shared').splitlines()
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if inst.errno != errno.ENOENT:
raise
return False
Angel Ezquerra
share: replace the bookmarks.shared file with an entry on a new "shared" file...
r23883 return 'bookmarks' in shared
Ryan McElroy
share: implement shared bookmark functionality...
r23548
def _getsrcrepo(repo):
"""
Returns the source repository object for a given shared repository.
If repo is not a shared repository, return None.
"""
Matt Harbison
share: use the 'sharedpath' attr on repo instead of reloading from the file...
r23626 if repo.sharedpath == repo.path:
return None
# the sharedpath always ends in the .hg; we want the path to the repo
source = repo.vfs.split(repo.sharedpath)[0]
srcurl, branches = parseurl(source)
return repository(repo.ui, srcurl)
Ryan McElroy
share: implement shared bookmark functionality...
r23548
def getbkfile(orig, self, repo):
if _hassharedbookmarks(repo):
srcrepo = _getsrcrepo(repo)
if srcrepo is not None:
repo = srcrepo
return orig(self, repo)
def recordchange(orig, self, tr):
# Continue with write to local bookmarks file as usual
orig(self, tr)
if _hassharedbookmarks(self._repo):
srcrepo = _getsrcrepo(self._repo)
if srcrepo is not None:
category = 'share-bookmarks'
tr.addpostclose(category, lambda tr: self._writerepo(srcrepo))
def write(orig, self):
# First write local bookmarks file in case we ever unshare
orig(self)
if _hassharedbookmarks(self._repo):
srcrepo = _getsrcrepo(self._repo)
if srcrepo is not None:
self._writerepo(srcrepo)