| Alphare |
| hg-reviewers |
The constant exists, lets use them. Otherwise we cannot make these constant more
powerful.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/convert/hg.py (5 lines) | |||
| M | mercurial/mergestate.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute |
| bookmarks, | bookmarks, | ||||
| context, | context, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| hg, | hg, | ||||
| lock as lockmod, | lock as lockmod, | ||||
| logcmdutil, | logcmdutil, | ||||
| merge as mergemod, | merge as mergemod, | ||||
| mergestate, | |||||
| phases, | phases, | ||||
| pycompat, | pycompat, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from mercurial.utils import dateutil | from mercurial.utils import dateutil | ||||
| stringio = util.stringio | stringio = util.stringio | ||||
| for file, (action, info, msg) in mresult.filemap(): | for file, (action, info, msg) in mresult.filemap(): | ||||
| if source.targetfilebelongstosource(file): | if source.targetfilebelongstosource(file): | ||||
| # If the file belongs to the source repo, ignore the p2 | # If the file belongs to the source repo, ignore the p2 | ||||
| # since it will be covered by the existing fileset. | # since it will be covered by the existing fileset. | ||||
| continue | continue | ||||
| # If the file requires actual merging, abort. We don't have enough | # If the file requires actual merging, abort. We don't have enough | ||||
| # context to resolve merges correctly. | # context to resolve merges correctly. | ||||
| if action in [b'm', b'dm', b'cd', b'dc']: | if action in mergestate.CONVERT_MERGE_ACTIONS: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _( | _( | ||||
| b"unable to convert merge commit " | b"unable to convert merge commit " | ||||
| b"since target parents do not merge cleanly (file " | b"since target parents do not merge cleanly (file " | ||||
| b"%s, parents %s and %s)" | b"%s, parents %s and %s)" | ||||
| ) | ) | ||||
| % (file, p1ctx, p2ctx) | % (file, p1ctx, p2ctx) | ||||
| ) | ) | ||||
| elif action == b'k': | elif action == mergestate.ACTION_KEEP: | ||||
| # 'keep' means nothing changed from p1 | # 'keep' means nothing changed from p1 | ||||
| continue | continue | ||||
| else: | else: | ||||
| # Any other change means we want to take the p2 version | # Any other change means we want to take the p2 version | ||||
| yield file | yield file | ||||
| def putcommit( | def putcommit( | ||||
| self, files, copies, parents, commit, source, revmap, full, cleanp2 | self, files, copies, parents, commit, source, revmap, full, cleanp2 | ||||
| # actions which are no op | # actions which are no op | ||||
| NO_OP_ACTIONS = ( | NO_OP_ACTIONS = ( | ||||
| ACTION_KEEP, | ACTION_KEEP, | ||||
| ACTION_KEEP_ABSENT, | ACTION_KEEP_ABSENT, | ||||
| ACTION_KEEP_NEW, | ACTION_KEEP_NEW, | ||||
| ) | ) | ||||
| # Used by concert to detect situation it does not like, not sure what the exact | |||||
| # criteria is | |||||
| CONVERT_MERGE_ACTIONS = ( | |||||
| ACTION_MERGE, | |||||
| ACTION_DIR_RENAME_MOVE_LOCAL, | |||||
| ACTION_CHANGED_DELETED, | |||||
| ACTION_DELETED_CHANGED, | |||||
| ) | |||||
| class _mergestate_base(object): | class _mergestate_base(object): | ||||
| """track 3-way merge state of individual files | """track 3-way merge state of individual files | ||||
| The merge state is stored on disk when needed. Two files are used: one with | The merge state is stored on disk when needed. Two files are used: one with | ||||
| an old format (version 1), and one with a new format (version 2). Version 2 | an old format (version 1), and one with a new format (version 2). Version 2 | ||||
| stores a superset of the data in version 1, including new kinds of records | stores a superset of the data in version 1, including new kinds of records | ||||
| in the future. For more about the new format, see the documentation for | in the future. For more about the new format, see the documentation for | ||||