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

comparison hgext/mq.py @ 3098:fe9b13e35e46

Merge with crew

author	Matt Mackall <mpm@selenic.com>
date	Fri, 15 Sep 2006 15:22:45 -0500
parents	7fa3d38a99b6
children	15fde1970003

comparison

equal deleted inserted replaced

-:1b738357bba9
+:fe9b13e35e46
 refresh contents of top applied patch     qrefresh
 '''
 from mercurial.demandload import *
 from mercurial.i18n import gettext as _
+from mercurial import commands
 demandload(globals(), "os sys re struct traceback errno bz2")
-demandload(globals(), "mercurial:cmdutil,commands,hg,patch,revlog,ui,util")
+demandload(globals(), "mercurial:cmdutil,hg,patch,revlog,ui,util")
 commands.norepo += " qclone qversion"
 class statusentry:
 def __init__(self, rev, name=None):
 if not name:
-fields = rev.split(':')
+fields = rev.split(':', 1)
 if len(fields) == 2:
 self.rev, self.name = fields
 else:
 self.rev, self.name = None, None
 else:
 err = 1
 break
 tr.close()
 return (err, n)
-def delete(self, repo, patches, keep=False):
+def delete(self, repo, patches, opts):
 realpatches = []
+appliedbase = 0
+forget = opts.get('forget')
 for patch in patches:
 patch = self.lookup(patch, strict=True)
 info = self.isapplied(patch)
-if info:
+if info and not forget:
 raise util.Abort(_("cannot delete applied patch %s") % patch)
 if patch not in self.series:
 raise util.Abort(_("patch %s not in series file") % patch)
+if forget:
+if not info:
+raise util.Abort(_("cannot forget unapplied patch %s") % patch)
+if info[0] != appliedbase:
+raise util.Abort(_("patch %s not at base") % patch)
+appliedbase += 1
 realpatches.append(patch)
-if not keep:
+if not opts.get('keep'):
 r = self.qrepo()
 if r:
 r.remove(realpatches, True)
 else:
 os.unlink(self.join(patch))
+if forget:
+del self.applied[:appliedbase]
+self.applied_dirty = 1
 indices = [self.find_series(p) for p in realpatches]
 indices.sort()
 for i in indices[-1::-1]:
 del self.full_series[i]
 self.parse_series()
 chgrpfile = bundle(backupch)
 stripall(rev, revnum)
 change = chlog.read(rev)
+chlog.strip(revnum, revnum)
 repo.manifest.strip(repo.manifest.rev(change[0]), revnum)
-chlog.strip(revnum, revnum)
 if saveheads:
 self.ui.status("adding branch\n")
 commands.unbundle(self.ui, repo, chgrpfile, update=False)
 if backup != "strip":
 os.unlink(chgrpfile)
 return self.series[sno]
 if not strict:
 # return any partial match made above
 if res:
 return res
-minus = patch.rsplit('-', 1)
+minus = patch.rfind('-')
-if len(minus) > 1:
+if minus >= 0:
-res = partial_name(minus[0])
+res = partial_name(patch[:minus])
 if res:
 i = self.series.index(res)
 try:
-off = int(minus[1] or 1)
+off = int(patch[minus+1:] or 1)
 except(ValueError, OverflowError):
 pass
 else:
 if i - off >= 0:
 return self.series[i - off]
-plus = patch.rsplit('+', 1)
+plus = patch.rfind('+')
-if len(plus) > 1:
+if plus >= 0:
-res = partial_name(plus[0])
+res = partial_name(patch[:plus])
 if res:
 i = self.series.index(res)
 try:
-off = int(plus[1] or 1)
+off = int(patch[plus+1:] or 1)
 except(ValueError, OverflowError):
 pass
 else:
 if i + off < len(self.series):
 return self.series[i + off]
 self.printdiff(repo, qp, files=pats, opts=opts)
 def refresh(self, repo, pats=None, **opts):
 if len(self.applied) == 0:
 self.ui.write("No patches applied\n")
-return
+return 1
 wlock = repo.wlock()
 self.check_toppatch(repo)
-(top, patch) = (self.applied[-1].rev, self.applied[-1].name)
+(top, patchfn) = (self.applied[-1].rev, self.applied[-1].name)
 top = revlog.bin(top)
 cparents = repo.changelog.parents(top)
 patchparent = self.qparents(repo, top)
-message, comments, user, date, patchfound = self.readheaders(patch)
+message, comments, user, date, patchfound = self.readheaders(patchfn)
-patchf = self.opener(patch, "w")
+patchf = self.opener(patchfn, "w")
 msg = opts.get('msg', '').rstrip()
 if msg:
 if comments:
 # Remove existing message.
 ci = 0
 m = list(util.unique(mm))
 r = list(util.unique(dd))
 a = list(util.unique(aa))
 filelist = filter(matchfn, util.unique(m + r + a))
-self.printdiff(repo, patchparent, files=filelist,
+if opts.get('git'):
-changes=(m, a, r, [], u), fp=patchf)
+self.diffopts().git = True
+patch.diff(repo, patchparent, files=filelist, match=matchfn,
+fp=patchf, changes=(m, a, r, [], u),
+opts=self.diffopts())
 patchf.close()
 changes = repo.changelog.read(tip)
 repo.dirstate.setparents(*cparents)
 copies = [(f, repo.dirstate.copied(f)) for f in a]
 repo.dirstate.update(mm, 'n', st_mtime=0)
 repo.dirstate.forget(forget)
 if not msg:
 if not message:
-message = "patch queue: %s\n" % patch
+message = "patch queue: %s\n" % patchfn
 else:
 message = "\n".join(message)
 else:
 message = msg
 self.strip(repo, top, update=False, backup='strip', wlock=wlock)
 n = repo.commit(filelist, message, changes[1], force=1, wlock=wlock)
-self.applied[-1] = statusentry(revlog.hex(n), patch)
+self.applied[-1] = statusentry(revlog.hex(n), patchfn)
 self.applied_dirty = 1
 else:
 self.printdiff(repo, patchparent, fp=patchf)
 patchf.close()
 self.pop(repo, force=True, wlock=wlock)
 if len(self.applied):
 p = self.appliedname(-1)
 self.ui.write(p + '\n')
 else:
 self.ui.write("No patches applied\n")
+return 1
 def next(self, repo):
 end = self.series_end()
 if end == len(self.series):
 self.ui.write("All patches applied\n")
+return 1
 else:
 p = self.series[end]
 if self.ui.verbose:
 self.ui.write("%d " % self.series.index(p))
 self.ui.write(p + '\n')
 if len(self.applied) > 1:
 p = self.appliedname(-2)
 self.ui.write(p + '\n')
 elif len(self.applied) == 1:
 self.ui.write("Only one patch applied\n")
+return 1
 else:
 self.ui.write("No patches applied\n")
+return 1
 def qimport(self, repo, files, patch=None, existing=None, force=None):
 if len(files) > 1 and patch:
 raise util.Abort(_('option "-n" not valid when importing multiple '
 'files'))
 qrepo.add(added)
 def delete(ui, repo, patch, *patches, **opts):
 """remove patches from queue
-The patches must not be applied.
+With --forget, mq will stop managing the named patches. The
-With -k, the patch files are preserved in the patch directory."""
+patches must be applied and at the base of the stack. This option
+is useful when the patches have been applied upstream.
+Otherwise, the patches must not be applied.
+With --keep, the patch files are preserved in the patch directory."""
 q = repo.mq
-q.delete(repo, (patch,) + patches, keep=opts.get('keep'))
+q.delete(repo, (patch,) + patches, opts)
 q.save_dirty()
 return 0
 def applied(ui, repo, patch=None, **opts):
 """print the patches already applied"""
 repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary'])
 return 0
 def top(ui, repo, **opts):
 """print the name of the current patch"""
-repo.mq.top(repo)
+return repo.mq.top(repo)
-return 0
 def next(ui, repo, **opts):
 """print the name of the next patch"""
-repo.mq.next(repo)
+return repo.mq.next(repo)
-return 0
 def prev(ui, repo, **opts):
 """print the name of the previous patch"""
-repo.mq.prev(repo)
+return repo.mq.prev(repo)
-return 0
 def new(ui, repo, patch, **opts):
 """create a new patch
 qnew creates a new patch on top of the currently-applied patch
 if message:
 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
 patch = q.applied[-1].name
 (message, comment, user, date, hasdiff) = q.readheaders(patch)
 message = ui.edit('\n'.join(message), user or ui.username())
-q.refresh(repo, pats, msg=message, **opts)
+ret = q.refresh(repo, pats, msg=message, **opts)
 q.save_dirty()
-return 0
+return ret
 def diff(ui, repo, *pats, **opts):
 """diff of the current patch"""
 repo.mq.diff(repo, pats, opts)
 return 0
 q = repo.mq
 if not files:
 raise util.Abort(_('qfold requires at least one patch name'))
 if not q.check_toppatch(repo):
-raise util.Abort(_('No patches applied\n'))
+raise util.Abort(_('No patches applied'))
 message = commands.logmessage(opts)
 if opts['edit']:
 if message:
 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
 if patch:
 patch = q.lookup(patch)
 else:
 if not q.applied:
 ui.write('No patches applied\n')
-return
+return 1
 patch = q.lookup('qtip')
 message = repo.mq.readheaders(patch)[0]
 ui.write('\n'.join(message) + '\n')
 if not name:
 name = patch
 patch = None
-if name in q.series:
-raise util.Abort(_('A patch named %s already exists in the series file') % name)
-absdest = q.join(name)
-if os.path.exists(absdest):
-raise util.Abort(_('%s already exists') % absdest)
 if patch:
 patch = q.lookup(patch)
 else:
 if not q.applied:
 ui.write(_('No patches applied\n'))
 return
 patch = q.lookup('qtip')
+absdest = q.join(name)
+if os.path.isdir(absdest):
+name = os.path.join(name, os.path.basename(patch))
+absdest = q.join(name)
+if os.path.exists(absdest):
+raise util.Abort(_('%s already exists') % absdest)
+if name in q.series:
+raise util.Abort(_('A patch named %s already exists in the series file') % name)
 if ui.verbose:
 ui.write('Renaming %s to %s\n' % (patch, name))
 i = q.find_series(patch)
 q.full_series[i] = name
 backup = 'all'
 if opts['backup']:
 backup = 'strip'
 elif opts['nobackup']:
 backup = 'none'
-repo.mq.strip(repo, rev, backup=backup)
+update = repo.dirstate.parents()[0] != revlog.nullid
+repo.mq.strip(repo, rev, backup=backup, update=update)
 return 0
 def select(ui, repo, *args, **opts):
 '''set or print guarded patches to push
 [('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 'hg qdiff [-I] [-X] [FILE]...'),
 "qdelete|qremove|qrm":
 (delete,
-[('k', 'keep', None, _('keep patch file'))],
+[('f', 'forget', None, _('stop managing an applied patch')),
-'hg qdelete [-k] PATCH'),
+('k', 'keep', None, _('keep patch file'))],
+'hg qdelete [-f] [-k] PATCH'),
 'qfold':
 (fold,
 [('e', 'edit', None, _('edit patch header')),
 ('k', 'keep', None, _('keep folded patch files')),
 ('m', 'message', '', _('set patch header to <text>')),
 "^qrefresh":
 (refresh,
 [('e', 'edit', None, _('edit commit message')),
 ('m', 'message', '', _('change commit message with <text>')),
 ('l', 'logfile', '', _('change commit message with <file> content')),
+('g', 'git', None, _('use git extended diff format')),
 ('s', 'short', None, 'short refresh'),
 ('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'),
 'qrename|qmv':
 'hg qselect [OPTION...] [GUARD...]'),
 "qseries":
 (series,
 [('m', 'missing', None, 'print patches not in series'),
 ('s', 'summary', None, _('print first line of patch header'))],
-'hg qseries [-m]'),
+'hg qseries [-ms]'),
 "^strip":
 (strip,
 [('f', 'force', None, 'force multi-head removal'),
 ('b', 'backup', None, 'bundle unrelated changesets'),
 ('n', 'nobackup', None, 'no backups')],

Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 3098:fe9b13e35e46