equal
deleted
inserted
replaced
3024 else: |
3024 else: |
3025 return False |
3025 return False |
3026 else: |
3026 else: |
3027 return f not in ctx2.manifest() |
3027 return f not in ctx2.manifest() |
3028 |
3028 |
3029 # TODO: remove the commitfunc parameter because it is no longer used |
3029 def amend(ui, repo, old, extra, pats, opts): |
3030 def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
3031 # avoid cycle context -> subrepo -> cmdutil |
3030 # avoid cycle context -> subrepo -> cmdutil |
3032 from . import context |
3031 from . import context |
3033 |
3032 |
3034 # amend will reuse the existing user if not specified, but the obsolete |
3033 # amend will reuse the existing user if not specified, but the obsolete |
3035 # marker creation requires that the current user's name is specified. |
3034 # marker creation requires that the current user's name is specified. |