equal
deleted
inserted
replaced
1744 q.save_dirty() |
1744 q.save_dirty() |
1745 return ret |
1745 return ret |
1746 |
1746 |
1747 def diff(ui, repo, *pats, **opts): |
1747 def diff(ui, repo, *pats, **opts): |
1748 """diff of the current patch and subsequent modifications |
1748 """diff of the current patch and subsequent modifications |
1749 |
1749 |
1750 Shows a diff which includes the current patch as well as any changes which |
1750 Shows a diff which includes the current patch as well as any changes which |
1751 have been made in the working directory since the last refresh (thus |
1751 have been made in the working directory since the last refresh (thus |
1752 showing what the current patch would become after a qrefresh). |
1752 showing what the current patch would become after a qrefresh). |
1753 |
1753 |
1754 Use 'hg diff' if you only want to see the changes made since the last |
1754 Use 'hg diff' if you only want to see the changes made since the last |
1755 qrefresh, or 'hg export qtip' if you want to see changes made by the |
1755 qrefresh, or 'hg export qtip' if you want to see changes made by the |
1756 current patch without including changes made since the qrefresh. |
1756 current patch without including changes made since the qrefresh. |
1757 """ |
1757 """ |
1758 repo.mq.diff(repo, pats, opts) |
1758 repo.mq.diff(repo, pats, opts) |
1942 mergeq=mergeq) |
1942 mergeq=mergeq) |
1943 return ret |
1943 return ret |
1944 |
1944 |
1945 def pop(ui, repo, patch=None, **opts): |
1945 def pop(ui, repo, patch=None, **opts): |
1946 """pop the current patch off the stack |
1946 """pop the current patch off the stack |
1947 |
1947 |
1948 By default, pops off the top of the patch stack. If given a patch name, |
1948 By default, pops off the top of the patch stack. If given a patch name, |
1949 keeps popping off patches until the named patch is at the top of the stack. |
1949 keeps popping off patches until the named patch is at the top of the stack. |
1950 """ |
1950 """ |
1951 localupdate = True |
1951 localupdate = True |
1952 if opts['name']: |
1952 if opts['name']: |