facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

mq: add --git option to qimport -r

Browse Source
This commit is contained in:
Brendan Cully 2006-11-20 13:03:52 -08:00
parent 0bafb6f99d
commit 83afafe362
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hgext/mq.py
View File

@ -1262,7 +1262,7 @@ class queue:
return p
def qimport(self, repo, files, patchname=None, rev=None, existing=None,
force=None):
force=None, git=False):
def checkseries(patchname):
if patchname in self.series:
raise util.Abort(_('patch %s is already in the series file')
@ -1307,6 +1307,9 @@ class queue:
% rev[0])
lastparent = None
if git:
self.diffopts().git = True
for r in rev:
p1, p2 = repo.changelog.parentrevs(r)
n = repo.changelog.node(r)
@ -1424,10 +1427,13 @@ def qimport(ui, repo, *filename, **opts):
An existing changeset may be placed under mq control with --rev
(e.g. qimport --rev tip -n patch will place tip under mq control).
With --git, patches imported with --rev will use the git diff
format.
"""
q = repo.mq
q.qimport(repo, filename, patchname=opts['name'],
existing=opts['existing'], force=opts['force'], rev=opts['rev'])
existing=opts['existing'], force=opts['force'], rev=opts['rev'],
git=opts['git'])
q.save_dirty()
return 0
@ -2090,8 +2096,9 @@ cmdtable = {
[('e', 'existing', None, 'import file in patch dir'),
('n', 'name', '', 'patch file name'),
('f', 'force', None, 'overwrite existing files'),
('r', 'rev', [], 'place existing revisions under mq control')],
'hg qimport [-e] [-n NAME] [-f] [-r REV]... FILE...'),
('r', 'rev', [], 'place existing revisions under mq control'),
('g', 'git', None, _('use git extended diff format'))],
'hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE...'),
"^qinit":
(init,
[('c', 'create-repo', None, 'create queue repository')],