Mercurial > hg
annotate tests/generate-working-copy-states.py @ 26631:e077ce385609
localrepo: restore dirstate to one before rollbacking if not parent-gone
'localrepository.rollback()' explicilty restores dirstate, only if at
least one of current parents of the working directory is removed at
rollbacking (a.k.a "parent-gone").
After DirstateTransactionPlan, 'dirstate.write()' will cause marking
'.hg/dirstate' as a file to be restored at rollbacking.
https://mercurial.selenic.com/wiki/DirstateTransactionPlan
Then, 'transaction.rollback()' restores '.hg/dirstate' regardless of
parents of the working directory at that time, and this causes
unexpected dirstate changes if not "parent-gone" (e.g. "hg update" to
another branch after "hg commit" or so, then "hg rollback").
To avoid such situation, this patch restores dirstate to one before
rollbacking if not "parent-gone".
before:
b1. restore dirstate explicitly, if "parent-gone"
after:
a1. save dirstate before actual rollbacking via dirstateguard
a2. restore dirstate via 'transaction.rollback()'
a3. if "parent-gone"
- discard backup (a1)
- restore dirstate from 'undo.dirstate'
a4. otherwise, restore dirstate from backup (a1)
Even though restoring dirstate at (a3) after (a2) seems redundant,
this patch keeps this existing code path, because:
- it isn't ensured that 'dirstate.write()' was invoked at least once
while transaction running
If not, '.hg/dirstate' isn't restored at (a2).
In addition to it, rude 3rd party extension invoking
'dirstate.write()' without 'repo' while transaction running (see
subsequent patches for detail) may break consistency of a file
backup-ed by transaction.
- this patch mainly focuses on changes for DirstateTransactionPlan
Restoring dirstate at (a3) itself should be cheaper enough than
rollbacking itself. Redundancy will be removed in next step.
Newly added test is almost meaningless at this point. It will be used
to detect regression while implementing delayed dirstate write out.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Tue, 13 Oct 2015 12:25:43 -0700 |
parents | 3849b89459b0 |
children | a327a24acfea |
rev | line source |
---|---|
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
1 # Helper script used for generating history and working copy files and content. |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
2 # The file's name corresponds to its history. The number of changesets can |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
3 # be specified on the command line. With 2 changesets, files with names like |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
4 # content1_content2_content1-untracked are generated. The first two filename |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
5 # segments describe the contents in the two changesets. The third segment |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
6 # ("content1-untracked") describes the state in the working copy, i.e. |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
7 # the file has content "content1" and is untracked (since it was previously |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
8 # tracked, it has been forgotten). |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
9 # |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
10 # This script generates the filenames and their content, but it's up to the |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
11 # caller to tell hg about the state. |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
12 # |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
13 # There are two subcommands: |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
14 # filelist <numchangesets> |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
15 # state <numchangesets> (<changeset>|wc) |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
16 # |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
17 # Typical usage: |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
18 # |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
19 # $ python $TESTDIR/generate-working-copy-states.py state 2 1 |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
20 # $ hg addremove --similarity 0 |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
21 # $ hg commit -m 'first' |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
22 # |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
23 # $ python $TESTDIR/generate-working-copy-states.py state 2 1 |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
24 # $ hg addremove --similarity 0 |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
25 # $ hg commit -m 'second' |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
26 # |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
27 # $ python $TESTDIR/generate-working-copy-states.py state 2 wc |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
28 # $ hg addremove --similarity 0 |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
29 # $ hg forget *_*_*-untracked |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
30 # $ rm *_*_missing-* |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
31 |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
32 import sys |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
33 import os |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
34 |
23446
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
35 # Generates pairs of (filename, contents), where 'contents' is a list |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
36 # describing the file's content at each revision (or in the working copy). |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
37 # At each revision, it is either None or the file's actual content. When not |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
38 # None, it may be either new content or the same content as an earlier |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
39 # revisions, so all of (modified,clean,added,removed) can be tested. |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
40 def generatestates(maxchangesets, parentcontents): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
41 depth = len(parentcontents) |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
42 if depth == maxchangesets + 1: |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
43 for tracked in ('untracked', 'tracked'): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
44 filename = "_".join([(content is None and 'missing' or content) for |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
45 content in parentcontents]) + "-" + tracked |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
46 yield (filename, parentcontents) |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
47 else: |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
48 for content in (set([None, 'content' + str(depth + 1)]) | |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
49 set(parentcontents)): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
50 for combination in generatestates(maxchangesets, |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
51 parentcontents + [content]): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
52 yield combination |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
53 |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
54 # retrieve the command line arguments |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
55 target = sys.argv[1] |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
56 maxchangesets = int(sys.argv[2]) |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
57 if target == 'state': |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
58 depth = sys.argv[3] |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
59 |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
60 # sort to make sure we have stable output |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
61 combinations = sorted(generatestates(maxchangesets, [])) |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
62 |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
63 # compute file content |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
64 content = [] |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
65 for filename, states in combinations: |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
66 if target == 'filelist': |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
67 print filename |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
68 elif target == 'state': |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
69 if depth == 'wc': |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
70 # Make sure there is content so the file gets written and can be |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
71 # tracked. It will be deleted outside of this script. |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
72 content.append((filename, states[maxchangesets] or 'TOBEDELETED')) |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
73 else: |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
74 content.append((filename, states[int(depth) - 1])) |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
75 else: |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
76 print >> sys.stderr, "unknown target:", target |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
77 sys.exit(1) |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
78 |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
79 # write actual content |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
80 for filename, data in content: |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
81 if data is not None: |
23494
3849b89459b0
generate-working-copy-states: open() in binary mode when writing content
Matt Harbison <matt_harbison@yahoo.com>
parents:
23447
diff
changeset
|
82 f = open(filename, 'wb') |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
83 f.write(data + '\n') |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
84 f.close() |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
85 elif os.path.exists(filename): |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
86 os.remove(filename) |