This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1723

githelp: improve help for `git add`
ClosedPublic

Authored by indygreg on Dec 19 2017, 12:36 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8dbd000f7de9: githelp: improve help for `git add`
Summary

The old code was referencing record and crecord, which are
deprecated. hg commit --interactive is the preferred mechanism
to use.

In addition, there was duplicate code in this function. It has
been removed.

Tests have been added to cover this function.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Dec 19 2017, 12:36 AM
durin42 accepted this revision.Dec 20 2017, 8:41 PM
This revision is now accepted and ready to land.Dec 20 2017, 8:41 PM
pulkit accepted this revision.Dec 28 2017, 3:56 PM
Closed by commit rHG8dbd000f7de9: githelp: improve help for `git add` (authored by indygreg). · Explain WhyJan 18 2018, 2:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/githelp.py (12 lines)
Mtests/test-githelp.t (15 lines)

Diff 4919

hgext/githelp.py

def add(ui, repo, *args, **kwargs): def add(ui, repo, *args, **kwargs):
cmdoptions = [ cmdoptions = [
('A', 'all', None, ''), ('A', 'all', None, ''),
('p', 'patch', None, ''), ('p', 'patch', None, ''),
] ]
args, opts = parseoptions(ui, cmdoptions, args) args, opts = parseoptions(ui, cmdoptions, args)
if (opts.get('patch')): if (opts.get('patch')):
ui.status(_("note: hg crecord has a better UI to record changes\n")) ui.status(_("note: Mercurial will commit when complete, "
ui.status(_("note: record and crecord will commit when complete, " "as there is no staging area in Mercurial\n\n"))
"as there is no staging area in mercurial\n\n")) cmd = Command('commit --interactive')
cmd = Command('record')
else: else:
cmd = Command("add") cmd = Command("add")
if not opts.get('all'): if not opts.get('all'):
cmd.extend(args) cmd.extend(args)
else: else:
ui.status(_("note: use hg addremove to remove files that have " ui.status(_("note: use hg addremove to remove files that have "
"been deleted.\n\n")) "been deleted.\n\n"))
if not opts.get('all'):
cmd.extend(args)
else:
ui.status(_("note: use hg addremove to remove files that have "
"been deleted.\n\n"))
ui.status((str(cmd)), "\n") ui.status((str(cmd)), "\n")
def am(ui, repo, *args, **kwargs): def am(ui, repo, *args, **kwargs):
cmdoptions=[ cmdoptions=[
] ]
args, opts = parseoptions(ui, cmdoptions, args) args, opts = parseoptions(ui, cmdoptions, args)
cmd = Command('mimport -m') cmd = Command('mimport -m')

tests/test-githelp.t

NOTE: ancestors() is part of the revset language. NOTE: ancestors() is part of the revset language.
Learn more about revsets with 'hg help revsets' Learn more about revsets with 'hg help revsets'
hg log -T '{node}\n' -r 'ancestor(A,B)' hg log -T '{node}\n' -r 'ancestor(A,B)'
githelp for git blame githelp for git blame
$ hg githelp -- git blame $ hg githelp -- git blame
hg annotate -udl hg annotate -udl
githelp for add
$ hg githelp -- git add
hg add
$ hg githelp -- git add -p
note: Mercurial will commit when complete, as there is no staging area in Mercurial
hg commit --interactive
$ hg githelp -- git add --all
note: use hg addremove to remove files that have been deleted.
hg add