author | Anton Shestakov <av6@dwimlabs.net> |
Thu, 11 Jul 2019 17:04:08 +0800 | |
changeset 4722 | 7839720c7c75 |
parent 4715 | 12c8b24757f4 |
child 4793 | 13c95218bac4 |
permissions | -rw-r--r-- |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 |
from __future__ import absolute_import |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 |
|
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
3 |
import collections |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
import hashlib |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 |
from mercurial import ( |
3873
b81fd1487e04
rewing: prevent rewind in case of uncommitted changes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3872
diff
changeset
|
7 |
cmdutil, |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 |
error, |
3863
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
9 |
hg, |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 |
obsolete, |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
11 |
obsutil, |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 |
scmutil, |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 |
) |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 |
from mercurial.i18n import _ |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 |
from . import ( |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 |
exthelper, |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 |
rewriteutil, |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 |
compat, |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 |
) |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 |
eh = exthelper.exthelper() |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 |
# flag in obsolescence markers to link to identical version |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 |
identicalflag = 4 |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 |
@eh.command( |
4715
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
29 |
b'rewind|undo', |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
30 |
[(b'', b'to', [], _(b"rewind to these revisions"), _(b'REV')), |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
31 |
(b'', b'as-divergence', None, _(b"preserve current latest successors")), |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
32 |
(b'', b'exact', None, _(b"only rewind explicitly selected revisions")), |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
33 |
(b'', b'from', [], |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
34 |
_(b"rewind these revisions to their predecessors"), _(b'REV')), |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
35 |
], |
12c8b24757f4
py3: use byte strings for @command registrations
Martin von Zweigbergk <martinvonz@google.com>
parents:
4624
diff
changeset
|
36 |
_(b''), |
4191
5c734be63c3e
evolve: adapt for changed @command decorator
Martin von Zweigbergk <martinvonz@google.com>
parents:
4158
diff
changeset
|
37 |
helpbasic=True) |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 |
def rewind(ui, repo, **opts): |
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
39 |
"""rewind a stack of changesets to a previous state |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
40 |
|
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
41 |
This command can be used to restore stacks of changesets to an obsolete |
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
42 |
state, creating identical copies. |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
43 |
|
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
44 |
There are two main ways to select the rewind target. Rewinding "from" |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
45 |
changesets will restore the direct predecessors of these changesets (and |
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
46 |
obsolete the changeset you rewind from). Rewinding "to" will restore the |
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
47 |
changeset you have selected (and obsolete their latest successors). |
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
48 |
|
3872
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
49 |
By default, we rewind from the working copy parents, restoring its |
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
50 |
predecessor. |
3872
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
51 |
|
3868
1742254d1190
rewind: automatically rewind entire stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3866
diff
changeset
|
52 |
When we rewind to an obsolete version, we also rewind to all its obsolete |
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
53 |
ancestors. To only rewind to the explicitly selected changesets use the |
3868
1742254d1190
rewind: automatically rewind entire stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3866
diff
changeset
|
54 |
`--exact` flag. Using the `--exact` flag can restore some changesets as |
1742254d1190
rewind: automatically rewind entire stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3866
diff
changeset
|
55 |
orphan. |
1742254d1190
rewind: automatically rewind entire stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3866
diff
changeset
|
56 |
|
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
57 |
The latest successors of the obsolete changesets will be superseded by |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
58 |
these new copies. This behavior can be disabled using `--as-divergence`, |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
59 |
the current latest successors won't be affected and content-divergence will |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
60 |
appear between them and the restored version of the obsolete changesets. |
3865
b945f2dae587
rewind: add a test for rewinding a fold
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3863
diff
changeset
|
61 |
|
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
62 |
Current rough edges: |
3865
b945f2dae587
rewind: add a test for rewinding a fold
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3863
diff
changeset
|
63 |
|
b945f2dae587
rewind: add a test for rewinding a fold
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3863
diff
changeset
|
64 |
* fold: rewinding to only some of the initially folded changesets will be |
b945f2dae587
rewind: add a test for rewinding a fold
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3863
diff
changeset
|
65 |
problematic. The fold result is marked obsolete and the part not |
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
66 |
rewinded to are "lost". Please use --as-divergence when you |
3865
b945f2dae587
rewind: add a test for rewinding a fold
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3863
diff
changeset
|
67 |
need to perform such operation. |
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
68 |
|
4091
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
69 |
* :hg:`rewind` might affect changesets outside the current stack. Without |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
70 |
--exact, we also restore ancestors of the rewind target, |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
71 |
obsoleting their latest successors (unless --as-divergent is |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
72 |
provided). In some case, these latest successors will be on |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
73 |
branches unrelated to the changeset you rewind from. |
2c60ad0d54a9
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
Martin von Zweigbergk <martinvonz@google.com>
parents:
3873
diff
changeset
|
74 |
(We plan to automatically detect this case in the future) |
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
75 |
|
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
76 |
""" |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 |
unfi = repo.unfiltered() |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
78 |
|
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
79 |
successorsmap = collections.defaultdict(set) |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
80 |
rewindmap = {} |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
81 |
sscache = {} |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
82 |
with repo.wlock(), repo.lock(): |
3873
b81fd1487e04
rewing: prevent rewind in case of uncommitted changes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3872
diff
changeset
|
83 |
# stay on the safe side: prevent local case in case we need to upgrade |
b81fd1487e04
rewing: prevent rewind in case of uncommitted changes
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3872
diff
changeset
|
84 |
cmdutil.bailifchanged(repo) |
3868
1742254d1190
rewind: automatically rewind entire stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3866
diff
changeset
|
85 |
|
3869
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
86 |
rewinded = _select_rewinded(repo, opts) |
3868
1742254d1190
rewind: automatically rewind entire stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3866
diff
changeset
|
87 |
|
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
88 |
if not opts['as_divergence']: |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
89 |
for rev in rewinded: |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
90 |
ctx = unfi[rev] |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
91 |
ssets = obsutil.successorssets(repo, ctx.node(), sscache) |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
92 |
if 1 < len(ssets): |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
93 |
msg = _('rewind confused by divergence on %s') % ctx |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
94 |
hint = _('solve divergence first or use "--as-divergence"') |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
95 |
raise error.Abort(msg, hint=hint) |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
96 |
if ssets and ssets[0]: |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
97 |
for succ in ssets[0]: |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
98 |
successorsmap[succ].add(ctx.node()) |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
99 |
|
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
100 |
# Check that we can rewind these changesets |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
101 |
with repo.transaction('rewind'): |
3866
de42d00d6ee2
rewind: use rewinded parent when creating multiple changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3865
diff
changeset
|
102 |
for rev in sorted(rewinded): |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
103 |
ctx = unfi[rev] |
3866
de42d00d6ee2
rewind: use rewinded parent when creating multiple changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3865
diff
changeset
|
104 |
rewindmap[ctx.node()] = _revive_revision(unfi, rev, rewindmap) |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
105 |
|
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
106 |
relationships = [] |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
107 |
cl = unfi.changelog |
3863
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
108 |
wctxp = repo[None].p1() |
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
109 |
update_target = None |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
110 |
for (source, dest) in sorted(successorsmap.items()): |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
111 |
newdest = [rewindmap[d] for d in sorted(dest, key=cl.rev)] |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
112 |
rel = (unfi[source], tuple(unfi[d] for d in newdest)) |
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
113 |
relationships.append(rel) |
3863
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
114 |
if wctxp.node() == source: |
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
115 |
update_target = newdest[-1] |
3861
bbe635dfd75c
rewind: obsolete latest successors unless instructed otherwise
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3859
diff
changeset
|
116 |
obsolete.createmarkers(unfi, relationships, operation='rewind') |
3863
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
117 |
if update_target is not None: |
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
118 |
hg.updaterepo(repo, update_target, False) |
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
119 |
|
3859
6e3d844b56f2
rewind: add a message about the rewinded changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3858
diff
changeset
|
120 |
repo.ui.status(_('rewinded to %d changesets\n') % len(rewinded)) |
3862
8d3eed113b77
rewind: add a message about obsolete changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3861
diff
changeset
|
121 |
if relationships: |
8d3eed113b77
rewind: add a message about obsolete changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3861
diff
changeset
|
122 |
repo.ui.status(_('(%d changesets obsoleted)\n') % len(relationships)) |
3863
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
123 |
if update_target is not None: |
c31be22d1d90
rewind: update the working copy if it gets obsoleted
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3862
diff
changeset
|
124 |
ui.status(_('working directory is now at %s\n') % repo['.']) |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
125 |
|
3869
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
126 |
def _select_rewinded(repo, opts): |
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
127 |
"""select the revision we shoudl rewind to |
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
128 |
""" |
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
129 |
unfi = repo.unfiltered() |
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
130 |
rewinded = set() |
3872
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
131 |
revsto = opts.get('to') |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
132 |
revsfrom = opts.get('from') |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
133 |
if not (revsto or revsfrom): |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
134 |
revsfrom.append('.') |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
135 |
if revsto: |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
136 |
rewinded.update(scmutil.revrange(repo, revsto)) |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
137 |
if revsfrom: |
bbc3cfdfe42b
rewind: default to rewinding the current stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3871
diff
changeset
|
138 |
succs = scmutil.revrange(repo, revsfrom) |
4624
c9798965b1f4
revset: switch internal uses and tests to `predecessors` from legacy name
Matt Harbison <matt_harbison@yahoo.com>
parents:
4194
diff
changeset
|
139 |
rewinded.update(unfi.revs('predecessors(%ld)', succs)) |
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
140 |
|
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
141 |
if not rewinded: |
3869
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
142 |
raise error.Abort('no revision to rewind to') |
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
143 |
|
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
144 |
if not opts['exact']: |
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
145 |
rewinded = unfi.revs('obsolete() and ::%ld', rewinded) |
3869
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
146 |
|
3871
2e32a1ef0c60
rewing: add the ability to rewind "from" revisions
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3869
diff
changeset
|
147 |
return sorted(rewinded) |
3869
bbfbaf46f7b0
rewind: move revision selection into its own function
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3868
diff
changeset
|
148 |
|
3866
de42d00d6ee2
rewind: use rewinded parent when creating multiple changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3865
diff
changeset
|
149 |
def _revive_revision(unfi, rev, rewindmap): |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
150 |
"""rewind a single revision rev. |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
151 |
""" |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
152 |
ctx = unfi[rev] |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
153 |
extra = ctx.extra().copy() |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
154 |
# rewind hash should be unique over multiple rewind. |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
155 |
user = unfi.ui.config('devel', 'user.obsmarker') |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
156 |
if not user: |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
157 |
user = unfi.ui.username() |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
158 |
date = unfi.ui.configdate('devel', 'default-date') |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
159 |
if date is None: |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
160 |
date = compat.makedate() |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
161 |
noise = "%s\0%s\0%d\0%d" % (ctx.node(), user, date[0], date[1]) |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
162 |
extra['__rewind-hash__'] = hashlib.sha256(noise).hexdigest() |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
163 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
164 |
p1 = ctx.p1().node() |
3866
de42d00d6ee2
rewind: use rewinded parent when creating multiple changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3865
diff
changeset
|
165 |
p1 = rewindmap.get(p1, p1) |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
166 |
p2 = ctx.p2().node() |
3866
de42d00d6ee2
rewind: use rewinded parent when creating multiple changesets
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3865
diff
changeset
|
167 |
p2 = rewindmap.get(p2, p2) |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
168 |
|
4722
7839720c7c75
rewind: make sure merge commits include files from p1 and p2
Anton Shestakov <av6@dwimlabs.net>
parents:
4715
diff
changeset
|
169 |
updates = [] |
7839720c7c75
rewind: make sure merge commits include files from p1 and p2
Anton Shestakov <av6@dwimlabs.net>
parents:
4715
diff
changeset
|
170 |
if len(ctx.parents()) > 1: |
7839720c7c75
rewind: make sure merge commits include files from p1 and p2
Anton Shestakov <av6@dwimlabs.net>
parents:
4715
diff
changeset
|
171 |
updates = ctx.parents() |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
172 |
extradict = {'extra': extra} |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
173 |
|
4722
7839720c7c75
rewind: make sure merge commits include files from p1 and p2
Anton Shestakov <av6@dwimlabs.net>
parents:
4715
diff
changeset
|
174 |
new, unusedvariable = rewriteutil.rewrite(unfi, ctx, updates, ctx, |
3858
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
175 |
[p1, p2], |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
176 |
commitopts=extradict) |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
177 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
178 |
obsolete.createmarkers(unfi, [(ctx, (unfi[new],))], |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
179 |
flag=identicalflag, operation='rewind') |
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
180 |
|
bb4f5ad63877
rewind: add a proto version of the command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
181 |
return new |