hgext/mq.py
changeset 6622 92ee960a928d
parent 6619 170818dad56b
parent 6621 d5cbbe2c49ce
child 6637 79434e68512a
equal deleted inserted replaced
6619:170818dad56b 6622:92ee960a928d
  1742     q.save_dirty()
  1742     q.save_dirty()
  1743     return ret
  1743     return ret
  1744 
  1744 
  1745 def diff(ui, repo, *pats, **opts):
  1745 def diff(ui, repo, *pats, **opts):
  1746     """diff of the current patch and subsequent modifications
  1746     """diff of the current patch and subsequent modifications
  1747     
  1747 
  1748     Shows a diff which includes the current patch as well as any changes which
  1748     Shows a diff which includes the current patch as well as any changes which
  1749     have been made in the working directory since the last refresh (thus
  1749     have been made in the working directory since the last refresh (thus
  1750     showing what the current patch would become after a qrefresh).
  1750     showing what the current patch would become after a qrefresh).
  1751     
  1751 
  1752     Use 'hg diff' if you only want to see the changes made since the last
  1752     Use 'hg diff' if you only want to see the changes made since the last
  1753     qrefresh, or 'hg export qtip' if you want to see changes made by the
  1753     qrefresh, or 'hg export qtip' if you want to see changes made by the
  1754     current patch without including changes made since the qrefresh.
  1754     current patch without including changes made since the qrefresh.
  1755     """
  1755     """
  1756     repo.mq.diff(repo, pats, opts)
  1756     repo.mq.diff(repo, pats, opts)
  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     
  1945 
  1946     By default, pops off the top of the patch stack. If given a patch name,
  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.
  1947     keeps popping off patches until the named patch is at the top of the stack.
  1948     """
  1948     """
  1949     localupdate = True
  1949     localupdate = True
  1950     if opts['name']:
  1950     if opts['name']: