equal
deleted
inserted
replaced
2119 |
2119 |
2120 return commitfunc(ui, repo, message, |
2120 return commitfunc(ui, repo, message, |
2121 scmutil.match(repo[None], pats, opts), opts) |
2121 scmutil.match(repo[None], pats, opts), opts) |
2122 |
2122 |
2123 def amend(ui, repo, commitfunc, old, extra, pats, opts): |
2123 def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
2124 # amend will reuse the existing user if not specified, but the obsolete |
|
2125 # marker creation requires that the current user's name is specified. |
|
2126 if obsolete._enabled: |
|
2127 ui.username() # raise exception if username not set |
|
2128 |
2124 ui.note(_('amending changeset %s\n') % old) |
2129 ui.note(_('amending changeset %s\n') % old) |
2125 base = old.p1() |
2130 base = old.p1() |
2126 |
2131 |
2127 wlock = lock = newid = None |
2132 wlock = lock = newid = None |
2128 try: |
2133 try: |