Patchwork D1579: unamend: drop unused vars, query after taking lock, use ctx.hex() for extras

login
register
mail settings
Submitter phabricator
Date Dec. 2, 2017, 7:06 p.m.
Message ID <differential-rev-PHID-DREV-xz6en56wj6sdpv62jmez-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/25900/
State Superseded
Headers show

Comments

phabricator - Dec. 2, 2017, 7:06 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This is the followup of review on https://phab.mercurial-scm.org/D821.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1579

AFFECTED FILES
  hgext/uncommit.py
  tests/test-unamend.t

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel
phabricator - Dec. 3, 2017, 6:43 a.m.
yuja accepted this revision.
yuja added a comment.
This revision is now accepted and ready to land.


  Queued, thanks.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1579

To: pulkit, #hg-reviewers, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/tests/test-unamend.t b/tests/test-unamend.t
--- a/tests/test-unamend.t
+++ b/tests/test-unamend.t
@@ -83,7 +83,7 @@ 
   
   $ hg unamend
   $ hg glog --hidden
-  @  9:8da14a1fd653  Added h
+  @  9:46d02d47eec6  Added h
   |
   | x  8:c9fa1a715c1b  Added h
   |/
@@ -104,7 +104,7 @@ 
   o  0:18d04c59bb5d  Added a
   
   $ hg diff
-  diff -r 8da14a1fd653 h
+  diff -r 46d02d47eec6 h
   --- a/h	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
@@ -116,11 +116,11 @@ 
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 8da14a1fd653c3f07fdad5760511c9e12652a306
+  # Node ID 46d02d47eec6ca096b8dcab3f8f5579c40c3dd9a
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
-  diff -r 87d6d6676308 -r 8da14a1fd653 h
+  diff -r 87d6d6676308 -r 46d02d47eec6 h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
@@ -131,7 +131,7 @@ 
 
   $ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log
   branch=default
-  unamend_source=\xc9\xfa\x1aq\\\x1bva\xc0\xfa\xfb6*\x9f0\xbdu\x87\x8d}
+  unamend_source=c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
 
 Using unamend to undo an unamed (intentional)
 
@@ -141,11 +141,11 @@ 
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 1c09887216571a9755fc9d2e7f0e41c2b49e341b
+  # Node ID 850ddfc1bc662997ec6094ada958f01f0cc8070a
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
-  diff -r 87d6d6676308 -r 1c0988721657 h
+  diff -r 87d6d6676308 -r 850ddfc1bc66 h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
@@ -170,14 +170,14 @@ 
   M b
 
   $ hg diff
-  diff -r 956548224719 a
+  diff -r ec338db45d51 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    foo
   +bar
   +foobar
-  diff -r 956548224719 b
+  diff -r ec338db45d51 b
   --- a/b	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
@@ -223,7 +223,7 @@ 
   $ hg status
   A bar
   $ hg diff
-  diff -r ff917aa01c86 bar
+  diff -r 7f79409af972 bar
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
@@ -236,9 +236,9 @@ 
 Unamending in middle of a stack
 
   $ hg glog
-  @  19:ff917aa01c86  Added things to a and b
+  @  19:7f79409af972  Added things to a and b
   |
-  o  12:956548224719  Added h
+  o  12:ec338db45d51  Added h
   |
   o  6:87d6d6676308  Added g
   |
@@ -261,9 +261,9 @@ 
   $ hg rebase -s 6 -d . -q
 
   $ hg glog
-  o  23:2b41b42e192a  Added things to a and b
+  o  23:03ddd6fc5af1  Added things to a and b
   |
-  o  22:1860df151f01  Added h
+  o  22:3e7b64ee157b  Added h
   |
   o  21:49635b68477e  Added g
   |
@@ -306,8 +306,8 @@ 
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID b087c66cada118d6c5487d3d7cb29cac239bd98a
-  # Parent  2b41b42e192adc425b106643c3fc89170d6b8add
+  # Node ID cfef290346fbee5126313d7e1aab51d877679b09
+  # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
@@ -326,8 +326,8 @@ 
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 9fa06fb09a83a86ec7368d15004dbc52ac1a5d2e
-  # Parent  2b41b42e192adc425b106643c3fc89170d6b8add
+  # Node ID eca050985275bb271ce3092b54e56ea5c85d29a3
+  # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
@@ -347,8 +347,8 @@ 
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 4cf9987c9b941f615930e7c46307b4dbf35697cf
-  # Parent  2b41b42e192adc425b106643c3fc89170d6b8add
+  # Node ID 552e3af4f01f620f88ca27be1f898316235b736a
+  # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
diff --git a/hgext/uncommit.py b/hgext/uncommit.py
--- a/hgext/uncommit.py
+++ b/hgext/uncommit.py
@@ -212,11 +212,11 @@ 
     """
 
     unfi = repo.unfiltered()
+    with repo.wlock(), repo.lock(), repo.transaction('unamend'):
 
-    # identify the commit from which to unamend
-    curctx = repo['.']
+        # identify the commit from which to unamend
+        curctx = repo['.']
 
-    with repo.wlock(), repo.lock(), repo.transaction('unamend'):
         if not curctx.mutable():
             raise error.Abort(_('cannot unamend public changesets'))
 
@@ -235,7 +235,7 @@ 
         # add an extra so that we get a new hash
         # note: allowing unamend to undo an unamend is an intentional feature
         extras = predctx.extra()
-        extras['unamend_source'] = curctx.node()
+        extras['unamend_source'] = curctx.hex()
 
         def filectxfn(repo, ctx_, path):
             try:
@@ -259,14 +259,7 @@ 
             newprednode = repo.commitctx(newctx)
 
         newpredctx = repo[newprednode]
-
-        changedfiles = []
-        wctx = repo[None]
-        wm = wctx.manifest()
-        cm = newpredctx.manifest()
         dirstate = repo.dirstate
-        diff = cm.diff(wm)
-        changedfiles.extend(diff.iterkeys())
 
         with dirstate.parentchange():
             dirstate.setparents(newprednode, node.nullid)