mercurial-crew-with-dirclash: hgext/mq.py comparison

comparison hgext/mq.py @ 2920:ef8ee4477019

merge with mpm.

author	Vadim Gelfer <vadim.gelfer@gmail.com>
date	Wed, 16 Aug 2006 10:46:24 -0700
parents	b70740aefa4d 3848488244fc
children	773c5b82d052

comparison

equal deleted inserted replaced

-:b70740aefa4d
+:ef8ee4477019
 lines = self.opener(self.status_path).read().splitlines()
 self.applied = [statusentry(l) for l in lines]
 def diffopts(self):
 if self._diffopts is None:
-self._diffopts = self.ui.diffopts()
+self._diffopts = patch.diffopts(self.ui)
 return self._diffopts
 def join(self, *p):
 return os.path.join(self.path, *p)
 def patch(self, repo, patchfile):
 '''Apply patchfile  to the working directory.
 patchfile: file name of patch'''
 try:
-(files, fuzz) = patch.patch(patchfile, self.ui, strip=1,
+pp = util.find_in_path('gpatch', os.environ.get('PATH', ''), 'patch')
-cwd=repo.root)
+f = os.popen("%s -d %s -p1 --no-backup-if-mismatch < %s" %
-except Exception, inst:
+(pp, util.shellquote(repo.root), util.shellquote(patchfile)))
-self.ui.note(str(inst) + '\n')
+except:
-if not self.ui.verbose:
+self.ui.warn("patch failed, unable to continue (try -v)\n")
-self.ui.warn("patch failed, unable to continue (try -v)\n")
+return (None, [], False)
-return (False, [], False)
+files = []
+fuzz = False
-return (True, files.keys(), fuzz)
+for l in f:
+l = l.rstrip('\r\n');
+if self.ui.verbose:
+self.ui.warn(l + "\n")
+if l[:14] == 'patching file ':
+pf = os.path.normpath(util.parse_patch_output(l))
+if pf not in files:
+files.append(pf)
+printed_file = False
+file_str = l
+elif l.find('with fuzz') >= 0:
+if not printed_file:
+self.ui.warn(file_str + '\n')
+printed_file = True
+self.ui.warn(l + '\n')
+fuzz = True
+elif l.find('saving rejects to file') >= 0:
+self.ui.warn(l + '\n')
+elif l.find('FAILED') >= 0:
+if not printed_file:
+self.ui.warn(file_str + '\n')
+printed_file = True
+self.ui.warn(l + '\n')
+return (not f.close(), files, fuzz)
 def apply(self, repo, series, list=False, update_status=True,
 strict=False, patchdir=None, merge=None, wlock=None):
 # TODO unify with commands.py
 if not patchdir:
 err = 1
 break
 tr.close()
 return (err, n)
-def delete(self, repo, patches, keep=False):
+def delete(self, repo, patch, force=False):
-realpatches = []
+patch = self.lookup(patch, strict=True)
-for patch in patches:
+info = self.isapplied(patch)
-patch = self.lookup(patch, strict=True)
+if info:
-info = self.isapplied(patch)
+raise util.Abort(_("cannot delete applied patch %s") % patch)
-if info:
+if patch not in self.series:
-raise util.Abort(_("cannot delete applied patch %s") % patch)
+raise util.Abort(_("patch %s not in series file") % patch)
-if patch not in self.series:
+if force:
-raise util.Abort(_("patch %s not in series file") % patch)
-realpatches.append(patch)
-if not keep:
 r = self.qrepo()
 if r:
-r.remove(realpatches, True)
+r.remove([patch], True)
 else:
 os.unlink(self.join(patch))
+i = self.find_series(patch)
-indices = [self.find_series(p) for p in realpatches]
+del self.full_series[i]
-indices.sort()
-for i in indices[-1::-1]:
-del self.full_series[i]
 self.parse_series()
 self.series_dirty = 1
 def check_toppatch(self, repo):
 if len(self.applied) > 0:
 self.series_dirty = 1
 qrepo = self.qrepo()
 if qrepo:
 qrepo.add(added)
-def delete(ui, repo, patch, *patches, **opts):
+def delete(ui, repo, patch, **opts):
-"""remove patches from queue
+"""remove a patch from the series file
-The patches must not be applied.
+The patch must not be applied.
-With -k, the patch files are preserved in the patch directory."""
+With -f, deletes the patch file as well as the series entry."""
 q = repo.mq
-q.delete(repo, (patch,) + patches, keep=opts.get('keep'))
+q.delete(repo, patch, force=opts.get('force'))
 q.save_dirty()
 return 0
 def applied(ui, repo, patch=None, **opts):
 """print the patches already applied"""
 Patches must not yet be applied. Each patch will be successively
 applied to the current patch in the order given. If all the
 patches apply successfully, the current patch will be refreshed
 with the new cumulative patch, and the folded patches will
-be deleted. With -k/--keep, the folded patch files will not
+be deleted. With -f/--force, the folded patch files will
 be removed afterwards.
 The header for each folded patch will be concatenated with
 the current patch header, separated by a line of '* * *'."""
 message = ui.edit(message, user or ui.username())
 q.refresh(repo, msg=message)
 for patch in patches:
-q.delete(repo, patch, keep=opts['keep'])
+q.delete(repo, patch, force=opts['force'])
 q.save_dirty()
 def guard(ui, repo, *args, **opts):
 '''set or print guards for a patch
 "qcommit|qci":
 (commit,
 commands.table["^commit|ci"][1],
 'hg qcommit [OPTION]... [FILE]...'),
 "^qdiff": (diff, [], 'hg qdiff [FILE]...'),
-"qdelete|qremove|qrm":
+"qdelete":
 (delete,
-[('k', 'keep', None, _('keep patch file'))],
+[('f', 'force', None, _('delete patch file'))],
-'hg qdelete [-k] PATCH'),
+'hg qdelete [-f] PATCH'),
 'qfold':
 (fold,
 [('e', 'edit', None, _('edit patch header')),
-('k', 'keep', None, _('keep folded patch files')),
+('f', 'force', None, _('delete folded patch files')),
 ('m', 'message', '', _('set patch header to <text>')),
 ('l', 'logfile', '', _('set patch header to contents of <file>'))],
 'hg qfold [-e] [-m <text>] [-l <file] PATCH...'),
 'qguard': (guard, [('l', 'list', None, _('list all patches and guards')),
 ('n', 'none', None, _('drop all guards'))],

Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 2920:ef8ee4477019