Mercurial > hg
annotate tests/generate-working-copy-states.py @ 33453:f6b7617a85bb
phases: add a 'registernew' method to set new phases
This new function will be used by code that adds new changesets. It ajusts the
phase boundary to make sure added changesets are at least in their target
phase (they end up in an higher phase if their parents are in a higher phase).
Having a dedicated function also simplify the phases tracking. All the new
nodes are passed as argument, so we know that all of them needs to have their
new phase registered. We also know that no other nodes will be affected, so no
extra computation are needed.
This function differ from 'retractboundary' where some nodes might change
phase while some other might not. It can also affect nodes not passed as
parameters.
These simplification also apply to the computation itself. For now we use
'_retractboundary' there by convenience, but we may introduces simpler code
later.
While registering new revisions, we still need to check the actual phases of
the added node because it might be higher than the target phase (eg: target is
draft but parent is secret).
We will migrate users over the next changesets.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 11 Jul 2017 03:47:25 +0200 |
parents | bd872f64a8ba |
children | 27ab9264dd61 |
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 |
28725
3cf1995dbdd5
py3: use print_function in generate-working-copy-states.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
27295
diff
changeset
|
32 from __future__ import absolute_import, print_function |
27295
a327a24acfea
tests: use absolute_import in generate-working-copy-states.py
Gregory Szorc <gregory.szorc@gmail.com>
parents:
23494
diff
changeset
|
33 |
a327a24acfea
tests: use absolute_import in generate-working-copy-states.py
Gregory Szorc <gregory.szorc@gmail.com>
parents:
23494
diff
changeset
|
34 import os |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
35 import sys |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
36 |
23446
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
37 # 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
|
38 # 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
|
39 # 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
|
40 # 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
|
41 # 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
|
42 def generatestates(maxchangesets, parentcontents): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
43 depth = len(parentcontents) |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
44 if depth == maxchangesets + 1: |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
45 for tracked in ('untracked', 'tracked'): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
46 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
|
47 content in parentcontents]) + "-" + tracked |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
48 yield (filename, parentcontents) |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
49 else: |
32291
bd872f64a8ba
cleanup: use set literals
Martin von Zweigbergk <martinvonz@google.com>
parents:
28725
diff
changeset
|
50 for content in ({None, 'content' + str(depth + 1)} | |
23446
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
51 set(parentcontents)): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
52 for combination in generatestates(maxchangesets, |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
53 parentcontents + [content]): |
e51027c85dcd
generate-working-copy-states: generalize for depth
Martin von Zweigbergk <martinvonz@google.com>
parents:
23445
diff
changeset
|
54 yield combination |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
55 |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
56 # 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
|
57 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
|
58 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
|
59 if target == 'state': |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
60 depth = sys.argv[3] |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
61 |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
62 # 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
|
63 combinations = sorted(generatestates(maxchangesets, [])) |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
64 |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
65 # compute file content |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
66 content = [] |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
67 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
|
68 if target == 'filelist': |
28725
3cf1995dbdd5
py3: use print_function in generate-working-copy-states.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
27295
diff
changeset
|
69 print(filename) |
23447
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
70 elif target == 'state': |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
71 if depth == 'wc': |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
72 # 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
|
73 # 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
|
74 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
|
75 else: |
815e76a45b24
generate-working-copy-states: accept depth arguments on command line
Martin von Zweigbergk <martinvonz@google.com>
parents:
23446
diff
changeset
|
76 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
|
77 else: |
28725
3cf1995dbdd5
py3: use print_function in generate-working-copy-states.py
Robert Stanca <robert.stanca7@gmail.com>
parents:
27295
diff
changeset
|
78 print("unknown target:", target, file=sys.stderr) |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
79 sys.exit(1) |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
80 |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
81 # write actual content |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
82 for filename, data in content: |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
83 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
|
84 f = open(filename, 'wb') |
23195
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
85 f.write(data + '\n') |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
86 f.close() |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
87 elif os.path.exists(filename): |
29977b315be1
test-revert: move embedded script to its own file
Martin von Zweigbergk <martinvonz@google.com>
parents:
diff
changeset
|
88 os.remove(filename) |