Show More
@@ -14,30 +14,6 b' from . import (' | |||||
14 | obsolete, |
|
14 | obsolete, | |
15 | ) |
|
15 | ) | |
16 |
|
16 | |||
17 | def _destupdatevalidate(repo, rev, clean, check): |
|
|||
18 | """validate that the destination comply to various rules |
|
|||
19 |
|
||||
20 | This exists as its own function to help wrapping from extensions.""" |
|
|||
21 | wc = repo[None] |
|
|||
22 | p1 = wc.p1() |
|
|||
23 | if not clean: |
|
|||
24 | # Check that the update is linear. |
|
|||
25 | # |
|
|||
26 | # Mercurial do not allow update-merge for non linear pattern |
|
|||
27 | # (that would be technically possible but was considered too confusing |
|
|||
28 | # for user a long time ago) |
|
|||
29 | # |
|
|||
30 | # See mercurial.merge.update for details |
|
|||
31 | if p1.rev() not in repo.changelog.ancestors([rev], inclusive=True): |
|
|||
32 | dirty = wc.dirty(missing=True) |
|
|||
33 | foreground = obsolete.foreground(repo, [p1.node()]) |
|
|||
34 | if not repo[rev].node() in foreground: |
|
|||
35 | if dirty: |
|
|||
36 | msg = _("uncommitted changes") |
|
|||
37 | hint = _("commit and merge, or update --clean to" |
|
|||
38 | " discard changes") |
|
|||
39 | raise error.UpdateAbort(msg, hint=hint) |
|
|||
40 |
|
||||
41 | def _destupdateobs(repo, clean, check): |
|
17 | def _destupdateobs(repo, clean, check): | |
42 | """decide of an update destination from obsolescence markers""" |
|
18 | """decide of an update destination from obsolescence markers""" | |
43 | node = None |
|
19 | node = None | |
@@ -157,8 +133,6 b' def destupdate(repo, clean=False, check=' | |||||
157 | break |
|
133 | break | |
158 | rev = repo[node].rev() |
|
134 | rev = repo[node].rev() | |
159 |
|
135 | |||
160 | _destupdatevalidate(repo, rev, clean, check) |
|
|||
161 |
|
||||
162 | return rev, movemark, activemark |
|
136 | return rev, movemark, activemark | |
163 |
|
137 | |||
164 | msgdestmerge = { |
|
138 | msgdestmerge = { |
@@ -1562,7 +1562,7 b' def update(repo, node, branchmerge, forc' | |||||
1562 | else: |
|
1562 | else: | |
1563 | msg = _("uncommitted changes") |
|
1563 | msg = _("uncommitted changes") | |
1564 | hint = _("commit or update --clean to discard changes") |
|
1564 | hint = _("commit or update --clean to discard changes") | |
1565 | raise error.Abort(msg, hint=hint) |
|
1565 | raise error.UpdateAbort(msg, hint=hint) | |
1566 | else: |
|
1566 | else: | |
1567 | # Allow jumping branches if clean and specific rev given |
|
1567 | # Allow jumping branches if clean and specific rev given | |
1568 | pass |
|
1568 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now