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

equal deleted inserted replaced

-:0327bd1c831c
+:ee48e5ef8753
 from mercurial import ui, hg, revlog, commands, util
 versionstr = "0.45"
 commands.norepo += " qclone qversion"
+class StatusEntry:
+def __init__(self, rev, name=None):
+if not name:
+self.rev, self.name = rev.split(':')
+else:
+self.rev, self.name = rev, name
+def __str__(self):
+return self.rev + ':' + self.name
 class queue:
 def __init__(self, ui, path, patchdir=None):
 self.basepath = path
 if patchdir:
 if os.path.exists(os.path.join(self.path, self.series_path)):
 self.full_series = self.opener(self.series_path).read().splitlines()
 self.read_series(self.full_series)
 if os.path.exists(os.path.join(self.path, self.status_path)):
-self.applied = self.opener(self.status_path).read().splitlines()
+self.applied = [StatusEntry(l)
+for l in self.opener(self.status_path).read().splitlines()]
 def find_series(self, patch):
 pre = re.compile("(\s*)([^#]+)")
 index = 0
 for l in self.full_series:
 if len(self.applied) > 0:
 nl = "\n"
 else:
 nl = ""
 f = self.opener(self.status_path, "w")
-f.write("\n".join(self.applied) + nl)
+f.write("\n".join([str(x) for x in self.applied]) + nl)
 if self.series_dirty:
 if len(self.full_series) > 0:
 nl = "\n"
 else:
 nl = ""
 (p1, p2) = repo.dirstate.parents()
 if p2 == revlog.nullid:
 return p1
 if len(self.applied) == 0:
 return None
-(top, patch) = self.applied[-1].split(':')
+return revlog.bin(self.applied[-1].rev)
-top = revlog.bin(top)
-return top
 pp = repo.changelog.parents(rev)
 if pp[1] != revlog.nullid:
-arevs = [ x.split(':')[0] for x in self.applied ]
+arevs = [ x.rev for x in self.applied ]
 p0 = revlog.hex(pp[0])
 p1 = revlog.hex(pp[1])
 if p0 in arevs:
 return pp[0]
 if p1 in arevs:
 # the first patch in the queue is never a merge patch
 #
 pname = ".hg.patches.merge.marker"
 n = repo.commit(None, '[mq]: merge marker', user=None, force=1,
 wlock=wlock)
-self.applied.append(revlog.hex(n) + ":" + pname)
+self.applied.append(StatusEntry(revlog.hex(n), pname))
 self.applied_dirty = 1
 head = self.qparents(repo)
 for patch in series:
 self.ui.warn("patch %s is not applied\n" % patch)
 return (1, None)
 rev = revlog.bin(info[1])
 (err, head) = self.mergeone(repo, mergeq, head, patch, rev, wlock)
 if head:
-self.applied.append(revlog.hex(head) + ":" + patch)
+self.applied.append(StatusEntry(revlog.hex(head), patch))
 self.applied_dirty = 1
 if err:
 return (err, head)
 return (0, head)
 if n == None:
 raise util.Abort(_("repo commit failed"))
 if update_status:
-self.applied.append(revlog.hex(n) + ":" + patch)
+self.applied.append(StatusEntry(revlog.hex(n), patch))
 if patcherr:
 if not patchfound:
 self.ui.warn("patch %s is empty\n" % patch)
 err = 0
 self.read_series(self.full_series)
 self.series_dirty = 1
 def check_toppatch(self, repo):
 if len(self.applied) > 0:
-(top, patch) = self.applied[-1].split(':')
+top = revlog.bin(self.applied[-1].rev)
-top = revlog.bin(top)
 pp = repo.dirstate.parents()
 if top not in pp:
 raise util.Abort(_("queue top not at same revision as working directory"))
 return top
 return None
 n = repo.commit(commitfiles,
 "New patch: %s" % patch, force=True, wlock=wlock)
 if n == None:
 raise util.Abort(_("repo commit failed"))
 self.full_series[insert:insert] = [patch]
-self.applied.append(revlog.hex(n) + ":" + patch)
+self.applied.append(StatusEntry(revlog.hex(n), patch))
 self.read_series(self.full_series)
 self.series_dirty = 1
 self.applied_dirty = 1
 p = self.opener(patch, "w")
 if msg:
 os.unlink(chgrpfile)
 def isapplied(self, patch):
 """returns (index, rev, patch)"""
 for i in xrange(len(self.applied)):
-p = self.applied[i]
+a = self.applied[i]
-a = p.split(':')
+if a.name == patch:
-if a[1] == patch:
+return (i, a.rev, a.name)
-return (i, a[0], a[1])
 return None
 # if the exact patch name does not exist, we try a few
 # variations.  If strict is passed, we try only #1
 #
 s = self.series[start:end]
 if mergeq:
 ret = self.mergepatch(repo, mergeq, s, wlock)
 else:
 ret = self.apply(repo, s, list, wlock=wlock)
-top = self.applied[-1].split(':')[1]
+top = self.applied[-1].name
 if ret[0]:
 self.ui.write("Errors during apply, please fix and refresh %s\n" %
 top)
 else:
 self.ui.write("Now at: %s\n" % top)
 self.ui.warn(_("no patches applied\n"))
 sys.exit(1)
 if not update:
 parents = repo.dirstate.parents()
-rr = [ revlog.bin(x.split(':')[0]) for x in self.applied ]
+rr = [ revlog.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:
 popi = info[0] + 1
 if popi >= end:
 self.ui.warn("qpop: %s is already at the top\n" % patch)
 return
-info = [ popi ] + self.applied[popi].split(':')
+info = [ popi ] + [self.applied[popi].rev, self.applied[popi].name]
 start = info[0]
 rev = revlog.bin(info[1])
 # we know there are no local changes, so we can make a simplified
 repo.dirstate.forget(a)
 repo.dirstate.setparents(qp, revlog.nullid)
 self.strip(repo, rev, update=False, backup='strip', wlock=wlock)
 del self.applied[start:end]
 if len(self.applied):
-self.ui.write("Now at: %s\n" % self.applied[-1].split(':')[1])
+self.ui.write("Now at: %s\n" % self.applied[-1].name)
 else:
 self.ui.write("Patch queue now empty\n")
 def diff(self, repo, files):
 top = self.check_toppatch(repo)
 self.ui.write("No patches applied\n")
 return
 wlock = repo.wlock()
 self.check_toppatch(repo)
 qp = self.qparents(repo)
-(top, patch) = self.applied[-1].split(':')
+(top, patch) = (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)
 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] = revlog.hex(n) + ':' + patch
+self.applied[-1] = StatusEntry(revlog.hex(n), patch)
 self.applied_dirty = 1
 else:
 commands.dodiff(patchf, self.ui, repo, patchparent, None)
 patchf.close()
 self.pop(repo, force=True, wlock=wlock)
 l = lines[i].rstrip()
 l = l[10:].split(' ')
 qpp = [ hg.bin(x) for x in l ]
 elif datastart != None:
 l = lines[i].rstrip()
-index = l.index(':')
+se = StatusEntry(l)
-id = l[:index]
+id = se.rev
-file = l[index + 1:]
+file = se.name
 if id:
-applied.append(l)
+applied.append(se)
 series.append(file)
 if datastart == None:
 self.ui.warn("No saved patch data found\n")
 return 1
 self.ui.warn("restoring status: %s\n" % lines[0])
 r = self.qrepo()
 if r:
 pp = r.dirstate.parents()
 msg += "\nDirstate: %s %s" % (hg.hex(pp[0]), hg.hex(pp[1]))
 msg += "\n\nPatch Data:\n"
-text = msg + "\n".join(self.applied) + '\n' + (ar and "\n".join(ar)
+text = msg + "\n".join(str(self.applied)) + '\n' + (ar and "\n".join(ar)
 + '\n' or "")
 n = repo.commit(None, text, user=None, force=1)
 if not n:
 self.ui.warn("repo commit failed\n")
 return 1
-self.applied.append(revlog.hex(n) + ":" + '.hg.patches.save.line')
+self.applied.append(StatusEntry(revlog.hex(n),'.hg.patches.save.line'))
 self.applied_dirty = 1
 def full_series_end(self):
 if len(self.applied) > 0:
-(top, p) = self.applied[-1].split(':')
+p = self.applied[-1].name
 end = self.find_series(p)
 if end == None:
 return len(self.full_series)
 return end + 1
 return 0
 def series_end(self):
 end = 0
 if len(self.applied) > 0:
-(top, p) = self.applied[-1].split(':')
+p = self.applied[-1].name
 try:
 end = self.series.index(p)
 except ValueError:
 return 0
 return end + 1
 for x in xrange(end):
 p = self.appliedname(x)
 self.ui.write("%s\n" % p)
 def appliedname(self, index):
-p = self.applied[index]
+pname = self.applied[index].name
-pname = p.split(':')[1]
 if not self.ui.verbose:
 p = pname
 else:
 p = str(self.series.index(pname)) + " " + p
 return p
 sr = hg.repository(ui, ui.expandpath(source))
 qbase, destrev = None, None
 if sr.local():
 reposetup(ui, sr)
 if sr.mq.applied:
-qbase = revlog.bin(sr.mq.applied[0].split(':')[0])
+qbase = revlog.bin(sr.mq.applied[0].rev)
 if not hg.islocal(dest):
 destrev = sr.parents(qbase)[0]
 ui.note(_('cloning main repo\n'))
 sr, dr = hg.clone(ui, sr, dest,
 pull=opts['pull'],
 q = repo.mq
 message=commands.logmessage(**opts)
 if opts['edit']:
 if message:
 raise util.Abort(_('option "-e" incompatible with "-m" or "-l"'))
-patch = q.applied[-1].split(':')[1]
+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, msg=message, short=opts['short'])
 q.save_dirty()
 return 0
 q.read_series(q.full_series)
 q.series_dirty = 1
 info = q.isapplied(patch)
 if info:
-q.applied[info[0]] = info[1] + ':' + name
+q.applied[info[0]] = StatusEntry(info[1], name)
 q.applied_dirty = 1
 util.rename(os.path.join(q.path, patch), absdest)
 r = q.qrepo()
 if r:
 q = self.mq
 if not q.applied:
 return tagscache
-mqtags = [patch.split(':') for patch in q.applied]
+mqtags = [(patch.rev, patch.name) for patch in q.applied]
 mqtags.append((mqtags[-1][0], 'qtip'))
 mqtags.append((mqtags[0][0], 'qbase'))
 for patch in mqtags:
 if patch[1] in tagscache:
 self.ui.warn('Tag %s overrides mq patch of the same name\n' % patch[1])

changeset 2775	ee48e5ef8753
parent 2765	0327bd1c831c
child 2776	ae726521717c