Patchwork D6841: uncommit: drop the hyphen from --current-user and --current-date

login
register
mail settings
Submitter phabricator
Date Sept. 11, 2019, 3:24 a.m.
Message ID <differential-rev-PHID-DREV-aewmznh52iu5hbttetll-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/41636/
State Superseded
Headers show

Comments

phabricator - Sept. 11, 2019, 3:24 a.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I didn't pay enough attention to these long forms- graft, amend and MQ already
  use the old style naming.  It's probably more important to be consistent than
  modern.  The hypenated style came from evolve.
  
  Yuya mentioned this naming discrepancy in 4145fd3569c3 <https://phab.mercurial-scm.org/rHG4145fd3569c32e7e511e8abb5fd1835154303d73>, but it didn't attract
  any discussion[1].  There's also a bit of inconsistency in that the default
  parameter for `currentdate` is `False` for graft, and `None` for the rest.
  
  [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-January/126767.html

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-uncommit.t

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -42,8 +42,8 @@ 
    -l --logfile FILE             read commit message from file
    -d --date DATE                record the specified date as commit date
    -u --user USER                record the specified user as committer
-   -D --current-date             record the current date as commit date
-   -U --current-user             record the current user as committer
+   -D --currentdate              record the current date as commit date
+   -U --currentuser              record the current user as committer
   
   (some details hidden, use --verbose to show complete help)
 
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -101,9 +101,9 @@ 
 ]
 
 commitopts3 = [
-    (b'D', b'current-date', None,
+    (b'D', b'currentdate', None,
      _(b'record the current date as commit date')),
-    (b'U', b'current-user', None,
+    (b'U', b'currentuser', None,
      _(b'record the current user as committer')),
 ]
 
@@ -186,9 +186,9 @@ 
     """modify commit options dict to handle related options
     """
     # N.B. this is extremely similar to setupheaderopts() in mq.py
-    if not opts.get(b'date') and opts.get(b'current_date'):
+    if not opts.get(b'date') and opts.get(b'currentdate'):
         opts[b'date'] = b'%d %d' % dateutil.makedate()
-    if not opts.get(b'user') and opts.get(b'current_user'):
+    if not opts.get(b'user') and opts.get(b'currentuser'):
         opts[b'user'] = ui.username()
 
 def ishunk(x):