mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:5d6244930559
+:adbf5e7df96d
 'meaning as the corresponding patch option'), _('NUM')),
 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
 ('', 'no-commit', None,
 _("don't commit, just update the working directory")),
+('', 'bypass', None,
+_("apply patch without touching the working directory")),
 ('', 'exact', None,
 _('apply patch to the nodes from which it was generated')),
 ('', 'import-branch', None,
 _('use any branch information in patch (implied by --exact)'))] +
 commitopts + commitopts2 + similarityopts,
 the parent of each patch before applying it, and will abort if the
 resulting changeset has a different ID than the one recorded in
 the patch. This may happen due to character set problems or other
 deficiencies in the text patch format.
+Use --bypass to apply and commit patches directly to the
+repository, not touching the working directory. Without --exact,
+patches will be applied on top of the working directory parent
+revision.
 With -s/--similarity, hg will attempt to discover renames and
 copies in the patch in the same way as 'addremove'.
 To read a patch from standard input, use "-" as the patch name. If
 a URL is specified, the patch will be downloaded from it.
 date = opts.get('date')
 if date:
 opts['date'] = util.parsedate(date)
+update = not opts.get('bypass')
+if not update and opts.get('no_commit'):
+raise util.Abort(_('cannot use --no-commit with --bypass'))
 try:
 sim = float(opts.get('similarity') or 0)
 except ValueError:
 raise util.Abort(_('similarity must be a number'))
 if sim < 0 or sim > 100:
 raise util.Abort(_('similarity must be between 0 and 100'))
+if sim and not update:
-if opts.get('exact') or not opts.get('force'):
+raise util.Abort(_('cannot use --similarity with --bypass'))
+if (opts.get('exact') or not opts.get('force')) and update:
 cmdutil.bailifchanged(repo)
 d = opts["base"]
 strip = opts["strip"]
 wlock = lock = None
 msgs = []
-def tryone(ui, hunk):
+def checkexact(repo, n, nodeid):
+if opts.get('exact') and hex(n) != nodeid:
+repo.rollback()
+raise util.Abort(_('patch is damaged or loses information'))
+def tryone(ui, hunk, parents):
 tmpname, message, user, date, branch, nodeid, p1, p2 = \
 patch.extract(ui, hunk)
 if not tmpname:
 return None
 else:
 # launch the editor
 message = None
 ui.debug('message:\n%s\n' % message)
-wp = repo.parents()
+if len(parents) == 1:
-if len(wp) == 1:
+parents.append(repo[nullid])
-wp.append(repo[nullid])
 if opts.get('exact'):
 if not nodeid or not p1:
 raise util.Abort(_('not a Mercurial patch'))
 p1 = repo[p1]
 p2 = repo[p2 or nullid]
 elif p2:
 try:
 p1 = repo[p1]
 p2 = repo[p2]
 except error.RepoError:
-p1, p2 = wp
+p1, p2 = parents
 else:
-p1, p2 = wp
+p1, p2 = parents
-if opts.get('exact') and p1 != wp[0]:
+n = None
-hg.clean(repo, p1.node())
+if update:
-if p1 != wp[0] and p2 != wp[1]:
+if opts.get('exact') and p1 != parents[0]:
-repo.dirstate.setparents(p1.node(), p2.node())
+hg.clean(repo, p1.node())
+if p1 != parents[0] and p2 != parents[1]:
-if opts.get('exact') or opts.get('import_branch'):
+repo.dirstate.setparents(p1.node(), p2.node())
-repo.dirstate.setbranch(branch or 'default')
+if opts.get('exact') or opts.get('import_branch'):
-files = set()
+repo.dirstate.setbranch(branch or 'default')
-patch.patch(ui, repo, tmpname, strip=strip, files=files,
-eolmode=None, similarity=sim / 100.0)
+files = set()
-files = list(files)
+patch.patch(ui, repo, tmpname, strip=strip, files=files,
-if opts.get('no_commit'):
+eolmode=None, similarity=sim / 100.0)
-if message:
+files = list(files)
-msgs.append(message)
+if opts.get('no_commit'):
+if message:
+msgs.append(message)
+else:
+if opts.get('exact'):
+m = None
+else:
+m = scmutil.matchfiles(repo, files or [])
+n = repo.commit(message, opts.get('user') or user,
+opts.get('date') or date, match=m,
+editor=cmdutil.commiteditor)
+checkexact(repo, n, nodeid)
+# Force a dirstate write so that the next transaction
+# backups an up-to-date file.
+repo.dirstate.write()
 else:
-if opts.get('exact'):
+if opts.get('exact') or opts.get('import_branch'):
-m = None
+branch = branch or 'default'
 else:
-m = scmutil.matchfiles(repo, files or [])
+branch = p1.branch()
-n = repo.commit(message, opts.get('user') or user,
+store = patch.filestore()
-opts.get('date') or date, match=m,
+try:
-editor=cmdutil.commiteditor)
+files = set()
-if opts.get('exact'):
+try:
-if hex(n) != nodeid:
+patch.patchrepo(ui, repo, p1, store, tmpname, strip,
-repo.rollback()
+files, eolmode=None)
-raise util.Abort(_('patch is damaged'
+except patch.PatchError, e:
-' or loses information'))
+raise util.Abort(str(e))
-# Force a dirstate write so that the next transaction
+memctx = patch.makememctx(repo, (p1.node(), p2.node()),
-# backups an up-do-date file.
+message,
-repo.dirstate.write()
+opts.get('user') or user,
-if n:
+opts.get('date') or date,
-commitid = short(n)
+branch, files, store,
+editor=cmdutil.commiteditor)
+repo.savecommitmessage(memctx.description())
+n = memctx.commit()
+checkexact(repo, n, nodeid)
+finally:
+store.close()
+if n:
+commitid = short(n)
 return commitid
 finally:
 os.unlink(tmpname)
 try:
 wlock = repo.wlock()
 lock = repo.lock()
+parents = repo.parents()
 lastcommit = None
 for p in patches:
 pf = os.path.join(d, p)
 if pf == '-':
 ui.status(_("applying %s\n") % p)
 pf = url.open(ui, pf)
 haspatch = False
 for hunk in patch.split(pf):
-commitid = tryone(ui, hunk)
+commitid = tryone(ui, hunk, parents)
 if commitid:
 haspatch = True
 if lastcommit:
 ui.status(_('applied %s\n') % lastcommit)
 lastcommit = commitid
+if update or opts.get('exact'):
+parents = repo.parents()
+else:
+parents = [repo[commitid]]
 if not haspatch:
 raise util.Abort(_('no diffs found'))
 if msgs:

changeset 14611	adbf5e7df96d
parent 14610	5d6244930559
child 14631	234b9795d74e