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

comparison hgext/mq.py @ 2696:be273f6074de

mq: patch naming shortcuts This adds some more options to the mq lookup routine. It allows you to use shortcuts in naming patches to push or pop. You can now use: 1) a full patch name 2) a number to indicate an offset in the series file 3) a unique substring of the patch name 4) patchname[-+]num to indicate an offset from a given patch. For case #3 substrings are allowed. qtip and qbase are aliases for the top and bottom of the applied patch queue, unless they are already in the series file as patch names.

author	Chris Mason <mason@suse.com>
date	Thu, 27 Jul 2006 09:27:35 -0700
parents	0fb28dbf0dc7
children	6c540dd14c38

comparison

equal deleted inserted replaced

-:c995d68333cf
+:be273f6074de
 self.applied_dirty = 1
 head = self.qparents(repo)
 for patch in series:
-patch = mergeq.lookup(patch)
+patch = mergeq.lookup(patch, strict=True)
 if not patch:
 self.ui.warn("patch %s does not exist\n" % patch)
 return (1, None)
 info = mergeq.isapplied(patch)
 tr.close()
 os.chdir(pwd)
 return (err, n)
 def delete(self, repo, patch):
-patch = self.lookup(patch)
+patch = self.lookup(patch, strict=True)
 info = self.isapplied(patch)
 if info:
 self.ui.warn("cannot delete applied patch %s\n" % patch)
 sys.exit(1)
 if patch not in self.series:
 a = p.split(':')
 if a[1] == patch:
 return (i, a[0], a[1])
 return None
-def lookup(self, patch):
+# if the exact patch name does not exist, we try a few
+# variations.  If strict is passed, we try only #1
+#
+# 1) a number to indicate an offset in the series file
+# 2) a unique substring of the patch name was given
+# 3) patchname[-+]num to indicate an offset in the series file
+def lookup(self, patch, strict=False):
+def partial_name(s):
+count = 0
+if s in self.series:
+return s
+for x in self.series:
+if s in x:
+count += 1
+last = x
+if count > 1:
+return None
+if count:
+return last
+if len(self.series) > 0 and len(self.applied) > 0:
+if s == 'qtip':
+return self.series[self.series_end()-1]
+if s == 'qbase':
+return self.series[0]
+return None
 if patch == None:
 return None
-if patch in self.series:
-return patch
+# we don't want to return a partial match until we make
+# sure the file name passed in does not exist (checked below)
+res = partial_name(patch)
+if res and res == patch:
+return res
 if not os.path.isfile(os.path.join(self.path, patch)):
 try:
 sno = int(patch)
 except(ValueError, OverflowError):
-self.ui.warn("patch %s not in series\n" % patch)
+pass
-sys.exit(1)
+else:
-if sno >= len(self.series):
+if sno < len(self.series):
-self.ui.warn("patch number %d is out of range\n" % sno)
+patch = self.series[sno]
-sys.exit(1)
+return patch
-patch = self.series[sno]
+if not strict:
-else:
+# return any partial match made above
-self.ui.warn("patch %s not in series\n" % patch)
+if res:
-sys.exit(1)
+return res
-return patch
+minus = patch.rsplit('-', 1)
+if len(minus) > 1:
+res = partial_name(minus[0])
+if res:
+i = self.series.index(res)
+try:
+off = int(minus[1] or 1)
+except(ValueError, OverflowError):
+pass
+else:
+if i - off >= 0:
+return self.series[i - off]
+plus = patch.rsplit('+', 1)
+if len(plus) > 1:
+res = partial_name(plus[0])
+if res:
+i = self.series.index(res)
+try:
+off = int(plus[1] or 1)
+except(ValueError, OverflowError):
+pass
+else:
+if i + off < len(self.series):
+return self.series[i + off]
+self.ui.warn("patch %s not in series\n" % patch)
+sys.exit(1)
 def push(self, repo, patch=None, force=False, list=False,
 mergeq=None, wlock=None):
 if not wlock:
 wlock = repo.wlock()

Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 2696:be273f6074de