##// END OF EJS Templates
patchbomb: warn when emailing a dirty working directory parent
Mads Kiilerich -
r21055:dbff8c11 default
parent child Browse files
Show More
@@ -291,7 +291,11 b' def patchbomb(ui, repo, *revs, **opts):'
291 return [str(r) for r in revs]
291 return [str(r) for r in revs]
292
292
293 def getpatches(revs):
293 def getpatches(revs):
294 prev = repo['.'].rev()
294 for r in scmutil.revrange(repo, revs):
295 for r in scmutil.revrange(repo, revs):
296 if r == prev and (repo[None].files() or repo[None].deleted()):
297 ui.warn(_('warning: working directory has '
298 'uncommitted changes\n'))
295 output = cStringIO.StringIO()
299 output = cStringIO.StringIO()
296 cmdutil.export(repo, [r], fp=output,
300 cmdutil.export(repo, [r], fp=output,
297 opts=patch.diffopts(ui, opts))
301 opts=patch.diffopts(ui, opts))
@@ -1805,7 +1805,9 b' no intro message in non-interactive mode'
1805 +b
1805 +b
1806
1806
1807
1807
1808 test single flag for single patch:
1808 test single flag for single patch (and no warning when not mailing dirty rev):
1809 $ hg up -qr1
1810 $ echo dirt > a
1809 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1811 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1810 > -r 2
1812 > -r 2
1811 this patch series consists of 1 patches.
1813 this patch series consists of 1 patches.
@@ -1839,9 +1841,10 b' test single flag for single patch:'
1839 +c
1841 +c
1840
1842
1841
1843
1842 test single flag for multiple patches:
1844 test single flag for multiple patches (and warning when mailing dirty rev):
1843 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1845 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag -f quux -t foo -c bar -s test \
1844 > -r 0:1
1846 > -r 0:1
1847 warning: working directory has uncommitted changes
1845 this patch series consists of 2 patches.
1848 this patch series consists of 2 patches.
1846
1849
1847
1850
@@ -1919,6 +1922,8 b' test single flag for multiple patches:'
1919 @@ -0,0 +1,1 @@
1922 @@ -0,0 +1,1 @@
1920 +b
1923 +b
1921
1924
1925 $ hg revert --no-b a
1926 $ hg up -q
1922
1927
1923 test multiple flags for single patch:
1928 test multiple flags for single patch:
1924 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
1929 $ hg email --date '1970-1-1 0:1' -n --flag fooFlag --flag barFlag -f quux -t foo \
General Comments 0
You need to be logged in to leave comments. Login now