mercurial: comparison hgext/mq.py

equal deleted inserted replaced

-:e7d3b509af8b
+:08a0f04b56bd
 if self.active_guards is None:
 self.active_guards = []
 try:
 guards = self.opener(self.guards_path).read().split()
 except IOError, err:
-if err.errno != errno.ENOENT: raise
+if err.errno != errno.ENOENT:
+raise
 guards = []
 for i, guard in enumerate(guards):
 bad = self.check_guard(guard)
 if bad:
 self.ui.warn('%s:%d: %s\n' %
 def write_list(items, path):
 fp = self.opener(path, 'w')
 for i in items:
 fp.write("%s\n" % i)
 fp.close()
-if self.applied_dirty: write_list(map(str, self.applied), self.status_path)
+if self.applied_dirty:
-if self.series_dirty: write_list(self.full_series, self.series_path)
+write_list(map(str, self.applied), self.status_path)
-if self.guards_dirty: write_list(self.active_guards, self.guards_path)
+if self.series_dirty:
+write_list(self.full_series, self.series_path)
+if self.guards_dirty:
+write_list(self.active_guards, self.guards_path)
 def removeundo(self, repo):
 undo = repo.sjoin('undo')
 if not os.path.exists(undo):
 return
 for chunk in chunks:
 write(chunk)
 def mergeone(self, repo, mergeq, head, patch, rev, diffopts):
 # first try just applying the patch
-(err, n) = self.apply(repo, [ patch ], update_status=False,
+(err, n) = self.apply(repo, [patch], update_status=False,
 strict=True, merge=rev)
 if err == 0:
 return (err, n)
 if len(self.applied) == 0:
 return None
 return bin(self.applied[-1].rev)
 pp = repo.changelog.parents(rev)
 if pp[1] != nullid:
-arevs = [ x.rev for x in self.applied ]
+arevs = [x.rev for x in self.applied]
 p0 = hex(pp[0])
 p1 = hex(pp[1])
 if p0 in arevs:
 return pp[0]
 if p1 in arevs:
 p.write(chunk)
 p.close()
 wlock.release()
 wlock = None
 r = self.qrepo()
-if r: r.add([patchfn])
+if r:
+r.add([patchfn])
 except:
 repo.rollback()
 raise
 except Exception:
 patchpath = self.join(patchfn)
 return patch
 if not os.path.isfile(self.join(patch)):
 try:
 sno = int(patch)
-except(ValueError, OverflowError):
+except (ValueError, OverflowError):
 pass
 else:
 if -len(self.series) <= sno < len(self.series):
 return self.series[sno]
 if minus >= 0:
 res = partial_name(patch[:minus])
 if res:
 i = self.series.index(res)
 try:
-off = int(patch[minus+1:] or 1)
+off = int(patch[minus + 1:] or 1)
-except(ValueError, OverflowError):
+except (ValueError, OverflowError):
 pass
 else:
 if i - off >= 0:
 return self.series[i - off]
 plus = patch.rfind('+')
 if plus >= 0:
 res = partial_name(patch[:plus])
 if res:
 i = self.series.index(res)
 try:
-off = int(patch[plus+1:] or 1)
+off = int(patch[plus + 1:] or 1)
-except(ValueError, OverflowError):
+except (ValueError, OverflowError):
 pass
 else:
 if i + off < len(self.series):
 return self.series[i + off]
 raise util.Abort(_("patch %s not in series") % patch)
 self.ui.warn(_("qpop: %s is already at the top\n") % patch)
 return
 if not update:
 parents = repo.dirstate.parents()
-rr = [ bin(x.rev) for x in self.applied ]
+rr = [bin(x.rev) for x in self.applied]
 for p in parents:
 if p in rr:
 self.ui.warn(_("qpop: forcing dirstate update\n"))
 update = True
 else:
 # remember the copies between patchparent and tip
 for dst in aaa:
 f = repo.file(dst)
 src = f.renamed(man[dst])
 if src:
-copies.setdefault(src[0], []).extend(copies.get(dst, []))
+copies.setdefault(src[0], []).extend(
+copies.get(dst, []))
 if dst in a:
 copies[src[0]].append(dst)
 # we can't copy a file created by the patch itself
 if dst in copies:
 del copies[dst]
 applied = set([p.name for p in self.applied])
 if length is None:
 length = len(self.series) - start
 if not missing:
 if self.ui.verbose:
-idxwidth = len(str(start+length - 1))
+idxwidth = len(str(start + length - 1))
-for i in xrange(start, start+length):
+for i in xrange(start, start + length):
 patch = self.series[i]
 if patch in applied:
 stat = 'A'
 elif self.pushable(i)[0]:
 stat = 'U'
 if line == 'Patch Data:':
 datastart = i + 1
 elif line.startswith('Dirstate:'):
 l = line.rstrip()
 l = l[10:].split(' ')
-qpp = [ bin(x) for x in l ]
+qpp = [bin(x) for x in l]
 elif datastart != None:
 l = line.rstrip()
 se = statusentry(l)
 file_ = se.name
 if se.rev:
 return 1
 if self.issaveline(self.applied[-1]):
 self.ui.warn(_("status is already saved\n"))
 return 1
-ar = [ ':' + x for x in self.full_series ]
+ar = [':' + x for x in self.full_series]
 if not msg:
 msg = _("hg patches saved state")
 else:
 msg = "hg patches: " + msg.rstrip('\r\n')
 r = self.qrepo()
 raise util.Abort(_("patch %s does not exist") % patchname)
 else:
 try:
 if filename == '-':
 if not patchname:
-raise util.Abort(_('need --name to import a patch from -'))
+raise util.Abort(
+_('need --name to import a patch from -'))
 text = sys.stdin.read()
 else:
 text = url.open(self.ui, filename).read()
 except (OSError, IOError):
 raise util.Abort(_("unable to read %s") % filename)
 def commit(ui, repo, *pats, **opts):
 """commit changes in the queue repository"""
 q = repo.mq
 r = q.qrepo()
-if not r: raise util.Abort('no queue repository')
+if not r:
+raise util.Abort('no queue repository')
 commands.commit(r.ui, r, *pats, **opts)
 def series(ui, repo, **opts):
 """print the entire series file"""
 repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary'])
 def top(ui, repo, **opts):
 """print the name of the current patch"""
 q = repo.mq
 t = q.applied and q.series_end(True) or 0
 if t:
-return q.qseries(repo, start=t-1, length=1, status='A',
+return q.qseries(repo, start=t - 1, length=1, status='A',
 summary=opts.get('summary'))
 else:
 ui.write(_("no patches applied\n"))
 return 1
 ui.write(_("only one patch applied\n"))
 return 1
 if not l:
 ui.write(_("no patches applied\n"))
 return 1
-return q.qseries(repo, start=l-2, length=1, status='A',
+return q.qseries(repo, start=l - 2, length=1, status='A',
 summary=opts.get('summary'))
 def setupheaderopts(ui, opts):
 if not opts.get('user') and opts.get('currentuser'):
 opts['user'] = ui.username()
 format. Read the diffs help topic for more information on why this
 is important for preserving permission changes and copy/rename
 information.
 """
 msg = cmdutil.logmessage(opts)
-def getmsg(): return ui.edit(msg, ui.username())
+def getmsg():
+return ui.edit(msg, ui.username())
 q = repo.mq
 opts['msg'] = msg
 if opts.get('edit'):
 opts['msg'] = getmsg
 else:
 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)
+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)
 guards = q.guard_re.findall(q.full_series[i])
 ui.status(_('popping guarded patches\n'))
 popped = True
 if i == 0:
 q.pop(repo, all=True)
 else:
-q.pop(repo, i-1)
+q.pop(repo, i - 1)
 break
 if popped:
 try:
 if reapply:
 ui.status(_('reapplying unguarded patches\n'))
 qbase = cl.rev(qbasenode)
 start = lrev + 1
 if start < qbase:
 # update the cache (excluding the patches) and save it
-self._updatebranchcache(partial, lrev+1, qbase)
+self._updatebranchcache(partial, lrev + 1, qbase)
-self._writebranchcache(partial, cl.node(qbase-1), qbase-1)
+self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1)
 start = qbase
 # if start = qbase, the cache is as updated as it should be.
 # if start > qbase, the cache includes (part of) the patches.
 # we might as well use it, but we won't save it.
 if repo.local():
 repo.__class__ = mqrepo
 def mqimport(orig, ui, repo, *args, **kwargs):
-if hasattr(repo, 'abort_if_wdir_patched') and not kwargs.get('no_commit', False):
+if (hasattr(repo, 'abort_if_wdir_patched')
+and not kwargs.get('no_commit', False)):
 repo.abort_if_wdir_patched(_('cannot import over an applied patch'),
 kwargs.get('force'))
 return orig(ui, repo, *args, **kwargs)
 def uisetup(ui):
 _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]')),
 "^qrefresh":
 (refresh,
 [('e', 'edit', None, _('edit commit message')),
 ('g', 'git', None, _('use git extended diff format')),
-('s', 'short', None, _('refresh only files already in the patch and specified files')),
+('s', 'short', None,
-('U', 'currentuser', None, _('add/update author field in patch with current user')),
+_('refresh only files already in the patch and specified files')),
-('u', 'user', '', _('add/update author field in patch with given user')),
+('U', 'currentuser', None,
-('D', 'currentdate', None, _('add/update date field in patch with current date')),
+_('add/update author field in patch with current user')),
-('d', 'date', '', _('add/update date field in patch with given date'))
+('u', 'user', '',
+_('add/update author field in patch with given user')),
+('D', 'currentdate', None,
+_('add/update date field in patch with current date')),
+('d', 'date', '',
+_('add/update date field in patch with given date'))
 ] + commands.walkopts + commands.commitopts,
 _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')),
 'qrename|qmv':
 (rename, [], _('hg qrename PATCH1 [PATCH2]')),
 "qrestore":

changeset 10282	08a0f04b56bd
parent 10276	6109a02c682b
child 10359	ec02cf8d1628