From patchwork Mon Nov 27 19:02:32 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D1522: Update hg githelp apply
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 25772
Message-Id: <differential-rev-PHID-DREV-x6ow5ytsvq46sqklnpr6-req@phab.mercurial-scm.org>
To: mercurial-devel@mercurial-scm.org
Date: Mon, 27 Nov 2017 19:02:32 +0000

gabrys created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext3rd/githelp.py

CHANGE DETAILS




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

diff --git a/hgext3rd/githelp.py b/hgext3rd/githelp.py
--- a/hgext3rd/githelp.py
+++ b/hgext3rd/githelp.py
@@ -201,7 +201,7 @@
     ]
     args, opts = parseoptions(ui, cmdoptions, args)
 
-    cmd = Command('import')
+    cmd = Command('import --no-commit')
     if (opts.get('p')):
         cmd['-p'] = opts.get('p')
     cmd.extend(args)