Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/mq.py @ 2488:2785aeb51be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: add qimported patches if patch dir is a repo
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 23 Jun 2006 12:52:42 -0700
parents 7c2623aedeb4
children 041d8f0a8437 37785f986260
comparison
equal deleted inserted replaced
2487:041363739ca8 2488:2785aeb51be4
998 def qimport(self, repo, files, patch=None, existing=None, force=None): 998 def qimport(self, repo, files, patch=None, existing=None, force=None):
999 if len(files) > 1 and patch: 999 if len(files) > 1 and patch:
1000 self.ui.warn("-n option not valid when importing multiple files\n") 1000 self.ui.warn("-n option not valid when importing multiple files\n")
1001 sys.exit(1) 1001 sys.exit(1)
1002 i = 0 1002 i = 0
1003 added = []
1003 for filename in files: 1004 for filename in files:
1004 if existing: 1005 if existing:
1005 if not patch: 1006 if not patch:
1006 patch = filename 1007 patch = filename
1007 if not os.path.isfile(os.path.join(self.path, patch)): 1008 if not os.path.isfile(os.path.join(self.path, patch)):
1026 index = self.series_end() + i 1027 index = self.series_end() + i
1027 self.full_series[index:index] = [patch] 1028 self.full_series[index:index] = [patch]
1028 self.read_series(self.full_series) 1029 self.read_series(self.full_series)
1029 self.ui.warn("adding %s to series file\n" % patch) 1030 self.ui.warn("adding %s to series file\n" % patch)
1030 i += 1 1031 i += 1
1032 added.append(patch)
1031 patch = None 1033 patch = None
1032 self.series_dirty = 1 1034 self.series_dirty = 1
1035 qrepo = self.qrepo()
1036 if qrepo:
1037 qrepo.add(added)
1033 1038
1034 def delete(ui, repo, patch, **opts): 1039 def delete(ui, repo, patch, **opts):
1035 """remove a patch from the series file""" 1040 """remove a patch from the series file"""
1036 q = repomap[repo] 1041 q = repomap[repo]
1037 q.delete(repo, patch) 1042 q.delete(repo, patch)