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