diff -r bd1483fd7088 -r 7f0cb9ee0534 hgext/uncommit.py --- a/hgext/uncommit.py Mon Jul 22 16:49:38 2024 +0200 +++ b/hgext/uncommit.py Tue Jul 23 10:02:46 2024 +0200 @@ -154,6 +154,7 @@ cmdutil.resolve_commit_options(ui, opts) with repo.wlock(), repo.lock(): + st = repo.status() m, a, r, d = st.modified, st.added, st.removed, st.deleted isdirtypath = any(set(m + a + r + d) & set(pats)) @@ -263,6 +264,7 @@ unfi = repo.unfiltered() with repo.wlock(), repo.lock(), repo.transaction(b'unamend'): + # identify the commit from which to unamend curctx = repo[b'.']