1939 ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
1939 ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
1940 mergeq=mergeq) |
1940 mergeq=mergeq) |
1941 return ret |
1941 return ret |
1942 |
1942 |
1943 def pop(ui, repo, patch=None, **opts): |
1943 def pop(ui, repo, patch=None, **opts): |
1944 """pop the current patch off the stack""" |
1944 """pop the current patch off the stack |
|
1945 |
|
1946 By default, pops off the top of the patch stack. If given a patch name, |
|
1947 keeps popping off patches until the named patch is at the top of the stack. |
|
1948 """ |
1945 localupdate = True |
1949 localupdate = True |
1946 if opts['name']: |
1950 if opts['name']: |
1947 q = queue(ui, repo.join(""), repo.join(opts['name'])) |
1951 q = queue(ui, repo.join(""), repo.join(opts['name'])) |
1948 ui.warn('using patch queue: %s\n' % q.path) |
1952 ui.warn('using patch queue: %s\n' % q.path) |
1949 localupdate = False |
1953 localupdate = False |
2319 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
2323 "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
2320 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
2324 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
2321 "^qpop": |
2325 "^qpop": |
2322 (pop, |
2326 (pop, |
2323 [('a', 'all', None, _('pop all patches')), |
2327 [('a', 'all', None, _('pop all patches')), |
2324 ('n', 'name', '', _('pop patches until the named patch is the current patch')), |
2328 ('n', 'name', '', _('queue name to pop')), |
2325 ('f', 'force', None, _('forget any local changes'))], |
2329 ('f', 'force', None, _('forget any local changes'))], |
2326 _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), |
2330 _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), |
2327 "^qpush": |
2331 "^qpush": |
2328 (push, |
2332 (push, |
2329 [('f', 'force', None, _('apply if the patch has rejects')), |
2333 [('f', 'force', None, _('apply if the patch has rejects')), |