Patchwork D3885: histedit: improve help text for --no-backup option

login
register
mail settings
Submitter phabricator
Date July 5, 2018, 5:38 a.m.
Message ID <differential-rev-PHID-DREV-m2snih5c733m5qe5oq5y-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/32620/
State Superseded
Headers show

Comments

phabricator - July 5, 2018, 5:38 a.m.
khanchi97 created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Improved help text for --no-backup option to clearly
  define it's meaning.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




To: khanchi97, durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - July 6, 2018, 5:42 p.m.
martinvonz added inline comments.

INLINE COMMENTS

> histedit.py:928
>       ('o', 'outgoing', False, _('changesets not found in destination')),
> -     ('', 'no-backup', False, _('no backup')),
> +     ('', 'no-backup', False, _('do not save backup copies of files')),
>       ('f', 'force', False,

To me, the "of files" makes it sounds like it's about .orig files, but I don't think that's what it actually is. Can we make it clearer?

REPOSITORY
  rHG Mercurial

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

To: khanchi97, durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel
phabricator - July 7, 2018, 3:03 a.m.
khanchi97 added inline comments.

INLINE COMMENTS

> martinvonz wrote in histedit.py:928
> To me, the "of files" makes it sounds like it's about .orig files, but I don't think that's what it actually is. Can we make it clearer?

How about "do not save backup copies of performed actions"?

REPOSITORY
  rHG Mercurial

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

To: khanchi97, durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel
phabricator - July 7, 2018, 6:49 a.m.
martinvonz added inline comments.

INLINE COMMENTS

> khanchi97 wrote in histedit.py:928
> How about "do not save backup copies of performed actions"?

Maybe "do not back up edited commits"? Is that reasonably accurate? I'm not sure what the option actually does. Is it both about the new versions that get stripped on --abort and the old versions that get stripped on completion (if not using obsmarkers)?

REPOSITORY
  rHG Mercurial

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

To: khanchi97, durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel
phabricator - July 7, 2018, 7:26 a.m.
khanchi97 added inline comments.

INLINE COMMENTS

> martinvonz wrote in histedit.py:928
> Maybe "do not back up edited commits"? Is that reasonably accurate? I'm not sure what the option actually does. Is it both about the new versions that get stripped on --abort and the old versions that get stripped on completion (if not using obsmarkers)?

I'm not sure. I don't know its working in case of old version and new version. Don't have good knowledge of obsmarkers yet. Maybe someone else can suggest who has better understanding of it's working?

REPOSITORY
  rHG Mercurial

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

To: khanchi97, durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -925,7 +925,7 @@ 
       _("don't strip old nodes after edit is complete")),
      ('', 'abort', False, _('abort an edit in progress')),
      ('o', 'outgoing', False, _('changesets not found in destination')),
-     ('', 'no-backup', False, _('no backup')),
+     ('', 'no-backup', False, _('do not save backup copies of files')),
      ('f', 'force', False,
       _('force outgoing even for unrelated repositories')),
      ('r', 'rev', [], _('first revision to be edited'), _('REV'))] +