D6864: py3: don't double-convert "opts" to bytes

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

D6864: py3: don't double-convert "opts" to bytes

martinvonz (Martin von Zweigbergk)
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The "opts" are already converted to bytes at the beginning of the
  function. Doing it twice results in a crash, which makes
  test-uncommit.t fail. The extra call was added recently, in
  ff1ff2aae132 <https://phab.mercurial-scm.org/rHGff1ff2aae132ba74687460df075acf32af427ac7> (uncommit: add support to modify the commit message and
  date, 2019-09-07). test-uncommit.t passes again after this patch.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/uncommit.py

CHANGE DETAILS

diff --git a/hgext/uncommit.py b/hgext/uncommit.py
--- a/hgext/uncommit.py
+++ b/hgext/uncommit.py
@@ -177,7 +177,7 @@
         with repo.transaction('uncommit'):
             if not (opts[b'message'] or opts[b'logfile']):
                 opts[b'message'] = old.description()
-            message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts))
+            message = cmdutil.logmessage(ui, opts)
 
             keepcommit = pats
             if not keepcommit:



To: martinvonz, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Reply | Threaded
Open this post in threaded view
|

D6864: py3: don't double-convert "opts" to bytes

martinvonz (Martin von Zweigbergk)
Closed by commit rHG44be33cf7a57: py3: don&#039;t double-convert &quot;opts&quot; to bytes (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6864?vs=16575&id=16585

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6864/new/

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

AFFECTED FILES
  hgext/uncommit.py

CHANGE DETAILS

diff --git a/hgext/uncommit.py b/hgext/uncommit.py
--- a/hgext/uncommit.py
+++ b/hgext/uncommit.py
@@ -177,7 +177,7 @@
         with repo.transaction('uncommit'):
             if not (opts[b'message'] or opts[b'logfile']):
                 opts[b'message'] = old.description()
-            message = cmdutil.logmessage(ui, pycompat.byteskwargs(opts))
+            message = cmdutil.logmessage(ui, opts)
 
             keepcommit = pats
             if not keepcommit:



To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
[hidden email]
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel