Show More
@@ -1814,6 +1814,9 b' class queue(object):' | |||
|
1814 | 1814 | |
|
1815 | 1815 | self.added.append(patchname) |
|
1816 | 1816 | patchname = None |
|
1817 | if rev: | |
|
1818 | # if we added anything with rev, we must move the secret root | |
|
1819 | phases.retractboundary(repo, phases.secret, [n]) | |
|
1817 | 1820 | self.parseseries() |
|
1818 | 1821 | self.applieddirty = True |
|
1819 | 1822 | self.seriesdirty = True |
@@ -1988,16 +1991,21 b' def qimport(ui, repo, *filename, **opts)' | |||
|
1988 | 1991 | |
|
1989 | 1992 | Returns 0 if import succeeded. |
|
1990 | 1993 | """ |
|
1991 | q = repo.mq | |
|
1994 | lock = repo.lock() # cause this may move phase | |
|
1992 | 1995 | try: |
|
1993 | q.qimport(repo, filename, patchname=opts.get('name'), | |
|
1994 | existing=opts.get('existing'), force=opts.get('force'), | |
|
1995 | rev=opts.get('rev'), git=opts.get('git')) | |
|
1996 | q = repo.mq | |
|
1997 | try: | |
|
1998 | q.qimport(repo, filename, patchname=opts.get('name'), | |
|
1999 | existing=opts.get('existing'), force=opts.get('force'), | |
|
2000 | rev=opts.get('rev'), git=opts.get('git')) | |
|
2001 | finally: | |
|
2002 | q.savedirty() | |
|
2003 | ||
|
2004 | ||
|
2005 | if opts.get('push') and not opts.get('rev'): | |
|
2006 | return q.push(repo, None) | |
|
1996 | 2007 | finally: |
|
1997 |
|
|
|
1998 | ||
|
1999 | if opts.get('push') and not opts.get('rev'): | |
|
2000 | return q.push(repo, None) | |
|
2008 | lock.release() | |
|
2001 | 2009 | return 0 |
|
2002 | 2010 | |
|
2003 | 2011 | def qinit(ui, repo, create): |
@@ -165,6 +165,8 b' try to import --push' | |||
|
165 | 165 | patch b.diff finalized without changeset message |
|
166 | 166 | patch another.diff finalized without changeset message |
|
167 | 167 | $ hg qimport -rtip -P |
|
168 | $ hg phase -r qbase | |
|
169 | 2: secret | |
|
168 | 170 | $ hg qpop -a |
|
169 | 171 | popping 2.diff |
|
170 | 172 | patch queue now empty |
General Comments 0
You need to be logged in to leave comments.
Login now