##// END OF EJS Templates
localrepo: make journal.dirstate contain in-memory changes before transaction...
localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see fe03f522dda9 for detail) and prevents from certainly reproducing the issue.

File last commit:

r23494:3849b894 default
r25878:800e090e stable
Show More
generate-working-copy-states.py
86 lines | 3.2 KiB | text/x-python | PythonLexer
/ tests / generate-working-copy-states.py
Martin von Zweigbergk
generate-working-copy-states: accept depth arguments on command line...
r23447 # Helper script used for generating history and working copy files and content.
# The file's name corresponds to its history. The number of changesets can
# be specified on the command line. With 2 changesets, files with names like
# content1_content2_content1-untracked are generated. The first two filename
# segments describe the contents in the two changesets. The third segment
# ("content1-untracked") describes the state in the working copy, i.e.
# the file has content "content1" and is untracked (since it was previously
# tracked, it has been forgotten).
#
# This script generates the filenames and their content, but it's up to the
# caller to tell hg about the state.
#
# There are two subcommands:
# filelist <numchangesets>
# state <numchangesets> (<changeset>|wc)
#
# Typical usage:
#
# $ python $TESTDIR/generate-working-copy-states.py state 2 1
# $ hg addremove --similarity 0
# $ hg commit -m 'first'
#
# $ python $TESTDIR/generate-working-copy-states.py state 2 1
# $ hg addremove --similarity 0
# $ hg commit -m 'second'
#
# $ python $TESTDIR/generate-working-copy-states.py state 2 wc
# $ hg addremove --similarity 0
# $ hg forget *_*_*-untracked
# $ rm *_*_missing-*
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195 import sys
import os
Martin von Zweigbergk
generate-working-copy-states: generalize for depth...
r23446 # Generates pairs of (filename, contents), where 'contents' is a list
# describing the file's content at each revision (or in the working copy).
# At each revision, it is either None or the file's actual content. When not
# None, it may be either new content or the same content as an earlier
# revisions, so all of (modified,clean,added,removed) can be tested.
def generatestates(maxchangesets, parentcontents):
depth = len(parentcontents)
if depth == maxchangesets + 1:
for tracked in ('untracked', 'tracked'):
filename = "_".join([(content is None and 'missing' or content) for
content in parentcontents]) + "-" + tracked
yield (filename, parentcontents)
else:
for content in (set([None, 'content' + str(depth + 1)]) |
set(parentcontents)):
for combination in generatestates(maxchangesets,
parentcontents + [content]):
yield combination
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195
Martin von Zweigbergk
generate-working-copy-states: accept depth arguments on command line...
r23447 # retrieve the command line arguments
target = sys.argv[1]
maxchangesets = int(sys.argv[2])
if target == 'state':
depth = sys.argv[3]
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195
Martin von Zweigbergk
generate-working-copy-states: accept depth arguments on command line...
r23447 # sort to make sure we have stable output
combinations = sorted(generatestates(maxchangesets, []))
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195
# compute file content
content = []
Martin von Zweigbergk
generate-working-copy-states: accept depth arguments on command line...
r23447 for filename, states in combinations:
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195 if target == 'filelist':
print filename
Martin von Zweigbergk
generate-working-copy-states: accept depth arguments on command line...
r23447 elif target == 'state':
if depth == 'wc':
# Make sure there is content so the file gets written and can be
# tracked. It will be deleted outside of this script.
content.append((filename, states[maxchangesets] or 'TOBEDELETED'))
else:
content.append((filename, states[int(depth) - 1]))
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195 else:
print >> sys.stderr, "unknown target:", target
sys.exit(1)
# write actual content
for filename, data in content:
if data is not None:
Matt Harbison
generate-working-copy-states: open() in binary mode when writing content...
r23494 f = open(filename, 'wb')
Martin von Zweigbergk
test-revert: move embedded script to its own file...
r23195 f.write(data + '\n')
f.close()
elif os.path.exists(filename):
os.remove(filename)