##// END OF EJS Templates
mq: eliminate warning on qpush with empty series...
Adrian Buehlmann -
r8795:51c29aec default
parent child Browse files
Show More
@@ -902,14 +902,14 b' class queue(object):'
902 902 def push(self, repo, patch=None, force=False, list=False,
903 903 mergeq=None, all=False):
904 904 wlock = repo.wlock()
905 if repo.dirstate.parents()[0] not in repo.heads():
906 self.ui.status(_("(working directory not at a head)\n"))
905 try:
906 if repo.dirstate.parents()[0] not in repo.heads():
907 self.ui.status(_("(working directory not at a head)\n"))
907 908
908 if not self.series:
909 self.ui.warn(_('no patches in series\n'))
910 return 0
909 if not self.series:
910 self.ui.warn(_('no patches in series\n'))
911 return 0
911 912
912 try:
913 913 patch = self.lookup(patch)
914 914 # Suppose our series file is: A B C and the current 'top'
915 915 # patch is B. qpush C should be performed (moving forward)
@@ -16,6 +16,10 b" echo 'syntax: glob' > .hgignore"
16 16 echo '.hgignore' >> .hgignore
17 17
18 18 hg qinit
19
20 echo '% test qpush on empty series'
21 hg qpush
22
19 23 hg qnew patch1
20 24 echo >> foo
21 25 hg qrefresh -m 'patch 1'
@@ -1,4 +1,6 b''
1 1 adding foo
2 % test qpush on empty series
3 no patches in series
2 4 patch queue now empty
3 5 applying patch1
4 6 applying patch2
General Comments 0
You need to be logged in to leave comments. Login now