This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1522

githelp: update suggestion for apply
ClosedPublic

Authored by gabrys on Nov 27 2017, 2:02 PM.
Tags
None
Subscribers
simpkins

Details

Reviewers
simpkins
Group Reviewers
Restricted Project
Commits
rFBHGX6ccc7322a4ae: githelp: update suggestion for apply
Summary

Current:

$ hg githelp apply abc.diff
hg import abc.diff

Expected:

$ hg githelp apply abc.diff
hg import --no-commit abc.diff

git apply doesn't commit the applied diff, hg import (without the flag) does.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

gabrys created this revision.Nov 27 2017, 2:02 PM
gabrys retitled this revision from Update hg githelp apply to githelp: update suggestion for apply.Nov 27 2017, 2:08 PM
pulkit removed a reviewer: hg-reviewers.Nov 27 2017, 2:24 PM
pulkit changed the repository for this revision from rHG Mercurial to rFBHGX Facebook Mercurial Extensions.
pulkit added a reviewer: Restricted Project.
pulkit removed a subscriber: mercurial-devel.
simpkins accepted this revision.Nov 27 2017, 2:34 PM
simpkins added a subscriber: simpkins.

Thanks!

This revision is now accepted and ready to land.Nov 27 2017, 2:34 PM
Closed by commit rFBHGX6ccc7322a4ae: githelp: update suggestion for apply (authored by gabrys). · Explain WhyNov 28 2017, 5:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/githelp.py (2 lines)

Diff 3884

hgext3rd/githelp.py

ui.status(_("note: requires the MboxExtension and the MqExtension.\n")) ui.status(_("note: requires the MboxExtension and the MqExtension.\n"))
def apply(ui, repo, *args, **kwargs): def apply(ui, repo, *args, **kwargs):
cmdoptions = [ cmdoptions = [
('p', 'p', int, ''), ('p', 'p', int, ''),
] ]
args, opts = parseoptions(ui, cmdoptions, args) args, opts = parseoptions(ui, cmdoptions, args)
cmd = Command('import') cmd = Command('import --no-commit')
if (opts.get('p')): if (opts.get('p')):
cmd['-p'] = opts.get('p') cmd['-p'] = opts.get('p')
cmd.extend(args) cmd.extend(args)
ui.status((str(cmd)), "\n") ui.status((str(cmd)), "\n")
def bisect(ui, repo, *args, **kwargs): def bisect(ui, repo, *args, **kwargs):
ui.status(_("See 'hg help bisect' for how to use bisect.\n\n")) ui.status(_("See 'hg help bisect' for how to use bisect.\n\n"))