##// END OF EJS Templates
Merge with stable
Sune Foldager -
r10023:15fbbc93 merge default
parent child Browse files
Show More
@@ -231,14 +231,15 b' def patchbomb(ui, repo, *revs, **opts):'
231 231 '''Return the revisions present locally but not in dest'''
232 232 dest = ui.expandpath(dest or 'default-push', dest or 'default')
233 233 dest, revs, checkout = hg.parseurl(dest, revs)
234 revs = [repo.lookup(rev) for rev in revs]
234 if revs:
235 revs = [repo.lookup(rev) for rev in revs]
235 236 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
236 237 ui.status(_('comparing with %s\n') % dest)
237 238 o = repo.findoutgoing(other)
238 239 if not o:
239 240 ui.status(_("no changes found\n"))
240 241 return []
241 o = repo.changelog.nodesbetween(o, revs or None)[0]
242 o = repo.changelog.nodesbetween(o, revs)[0]
242 243 return [str(repo.changelog.rev(r)) for r in o]
243 244
244 245 def getpatches(revs):
@@ -183,10 +183,13 b" hg email --date '1980-1-1 0:1' -m tmp.mb"
183 183 -s test -r 0
184 184 cat tmp.mbox | fixheaders
185 185
186 echo "% test outgoing and dest#branch URIs"
186 echo "% test outgoing"
187 187 hg up 1
188 188 hg branch test
189 189 echo d > d
190 190 hg add d
191 191 hg ci -md -d '4 0'
192 hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t | fixheaders
193
194 echo "% dest#branch URIs"
192 195 hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test | fixheaders
@@ -1533,12 +1533,282 b' diff -r 000000000000 -r 8580ff50825a a'
1533 1533 +a
1534 1534
1535 1535
1536 % test outgoing and dest#branch URIs
1536 % test outgoing
1537 1537 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
1538 1538 marked working directory as branch test
1539 1539 created new head
1540 1540 comparing with ../t
1541 1541 searching for changes
1542 This patch series consists of 8 patches.
1543
1544
1545 Write the introductory message for the patch series.
1546
1547
1548 Displaying [PATCH 0 of 8] test ...
1549 Content-Type: text/plain; charset="us-ascii"
1550 MIME-Version: 1.0
1551 Content-Transfer-Encoding: 7bit
1552 Subject: [PATCH 0 of 8] test
1553 Message-Id: <patchbomb.315532860@
1554 User-Agent: Mercurial-patchbomb
1555 Date: Tue, 01 Jan 1980 00:01:00 +0000
1556 From: test
1557 To: foo
1558
1559
1560 Displaying [PATCH 1 of 8] c ...
1561 Content-Type: text/plain; charset="us-ascii"
1562 MIME-Version: 1.0
1563 Content-Transfer-Encoding: 7bit
1564 Subject: [PATCH 1 of 8] c
1565 X-Mercurial-Node: ff2c9fa2018b15fa74b33363bda9527323e2a99f
1566 Message-Id: <ff2c9fa2018b15fa74b3.315532861@
1567 In-Reply-To: <patchbomb.315532860@
1568 References: <patchbomb.315532860@
1569 User-Agent: Mercurial-patchbomb
1570 Date: Tue, 01 Jan 1980 00:01:01 +0000
1571 From: test
1572 To: foo
1573
1574 # HG changeset patch
1575 # User test
1576 # Date 3 0
1577 # Node ID ff2c9fa2018b15fa74b33363bda9527323e2a99f
1578 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1579 c
1580
1581 diff -r 97d72e5f12c7 -r ff2c9fa2018b c
1582 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1583 +++ b/c Thu Jan 01 00:00:03 1970 +0000
1584 @@ -0,0 +1,1 @@
1585 +c
1586
1587 Displaying [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64 ...
1588 Content-Type: text/plain; charset="us-ascii"
1589 MIME-Version: 1.0
1590 Content-Transfer-Encoding: 8bit
1591 Subject: [PATCH 2 of 8] charset=utf-8; content-transfer-encoding: base64
1592 X-Mercurial-Node: c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
1593 Message-Id: <c3c9e37db9f4fe4882cd.315532862@
1594 In-Reply-To: <patchbomb.315532860@
1595 References: <patchbomb.315532860@
1596 User-Agent: Mercurial-patchbomb
1597 Date: Tue, 01 Jan 1980 00:01:02 +0000
1598 From: test
1599 To: foo
1600
1601 # HG changeset patch
1602 # User test
1603 # Date 4 0
1604 # Node ID c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
1605 # Parent ff2c9fa2018b15fa74b33363bda9527323e2a99f
1606 charset=utf-8; content-transfer-encoding: base64
1607
1608 diff -r ff2c9fa2018b -r c3c9e37db9f4 description
1609 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1610 +++ b/description Thu Jan 01 00:00:04 1970 +0000
1611 @@ -0,0 +1,3 @@
1612 +a multiline
1613 +
1614 +description
1615 diff -r ff2c9fa2018b -r c3c9e37db9f4 utf
1616 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1617 +++ b/utf Thu Jan 01 00:00:04 1970 +0000
1618 @@ -0,0 +1,1 @@
1619 +hΓΆmma!
1620
1621 Displaying [PATCH 3 of 8] charset=utf-8; content-transfer-encoding: quoted-printable ...
1622 Content-Type: text/plain; charset="us-ascii"
1623 MIME-Version: 1.0
1624 Content-Transfer-Encoding: quoted-printable
1625 Subject: [PATCH 3 of 8] charset=utf-8;
1626 content-transfer-encoding: quoted-printable
1627 X-Mercurial-Node: c655633f8c87700bb38cc6a59a2753bdc5a6c376
1628 Message-Id: <c655633f8c87700bb38c.315532863@
1629 In-Reply-To: <patchbomb.315532860@
1630 References: <patchbomb.315532860@
1631 User-Agent: Mercurial-patchbomb
1632 Date: Tue, 01 Jan 1980 00:01:03 +0000
1633 From: test
1634 To: foo
1635
1636 # HG changeset patch
1637 # User test
1638 # Date 4 0
1639 # Node ID c655633f8c87700bb38cc6a59a2753bdc5a6c376
1640 # Parent c3c9e37db9f4fe4882cda39baf42fed6bad8b15a
1641 charset=3Dutf-8; content-transfer-encoding: quoted-printable
1642
1643 diff -r c3c9e37db9f4 -r c655633f8c87 qp
1644 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1645 +++ b/qp Thu Jan 01 00:00:04 1970 +0000
1646 @@ -0,0 +1,4 @@
1647 +xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1648 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1649 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1650 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1651 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1652 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1653 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1654 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1655 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1656 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1657 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1658 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1659 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx=
1660 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
1661 +foo
1662 +
1663 +bar
1664
1665 Displaying [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit ...
1666 Content-Type: text/plain; charset="us-ascii"
1667 MIME-Version: 1.0
1668 Content-Transfer-Encoding: 8bit
1669 Subject: [PATCH 4 of 8] charset=us-ascii; content-transfer-encoding: 8bit
1670 X-Mercurial-Node: 22d0f96be12f5945fd67d101af58f7bc8263c835
1671 Message-Id: <22d0f96be12f5945fd67.315532864@
1672 In-Reply-To: <patchbomb.315532860@
1673 References: <patchbomb.315532860@
1674 User-Agent: Mercurial-patchbomb
1675 Date: Tue, 01 Jan 1980 00:01:04 +0000
1676 From: test
1677 To: foo
1678
1679 # HG changeset patch
1680 # User test
1681 # Date 5 0
1682 # Node ID 22d0f96be12f5945fd67d101af58f7bc8263c835
1683 # Parent c655633f8c87700bb38cc6a59a2753bdc5a6c376
1684 charset=us-ascii; content-transfer-encoding: 8bit
1685
1686 diff -r c655633f8c87 -r 22d0f96be12f isolatin
1687 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1688 +++ b/isolatin Thu Jan 01 00:00:05 1970 +0000
1689 @@ -0,0 +1,1 @@
1690 +hοΏ½mma!
1691
1692 Displaying [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a ...
1693 Content-Type: text/plain; charset="us-ascii"
1694 MIME-Version: 1.0
1695 Content-Transfer-Encoding: 7bit
1696 Subject: [PATCH 5 of 8] Added tag zero, zero.foo for changeset 8580ff50825a
1697 X-Mercurial-Node: dd9c2b4b8a8a0934d5523c15f2c119b362360903
1698 Message-Id: <dd9c2b4b8a8a0934d552.315532865@
1699 In-Reply-To: <patchbomb.315532860@
1700 References: <patchbomb.315532860@
1701 User-Agent: Mercurial-patchbomb
1702 Date: Tue, 01 Jan 1980 00:01:05 +0000
1703 From: test
1704 To: foo
1705
1706 # HG changeset patch
1707 # User test
1708 # Date 0 0
1709 # Node ID dd9c2b4b8a8a0934d5523c15f2c119b362360903
1710 # Parent 22d0f96be12f5945fd67d101af58f7bc8263c835
1711 Added tag zero, zero.foo for changeset 8580ff50825a
1712
1713 diff -r 22d0f96be12f -r dd9c2b4b8a8a .hgtags
1714 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1715 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
1716 @@ -0,0 +1,2 @@
1717 +8580ff50825a50c8f716709acdf8de0deddcd6ab zero
1718 +8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
1719
1720 Displaying [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7 ...
1721 Content-Type: text/plain; charset="us-ascii"
1722 MIME-Version: 1.0
1723 Content-Transfer-Encoding: 7bit
1724 Subject: [PATCH 6 of 8] Added tag one, one.patch for changeset 97d72e5f12c7
1725 X-Mercurial-Node: eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff
1726 Message-Id: <eae5fcf795eee29d0e45.315532866@
1727 In-Reply-To: <patchbomb.315532860@
1728 References: <patchbomb.315532860@
1729 User-Agent: Mercurial-patchbomb
1730 Date: Tue, 01 Jan 1980 00:01:06 +0000
1731 From: test
1732 To: foo
1733
1734 # HG changeset patch
1735 # User test
1736 # Date 0 0
1737 # Node ID eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff
1738 # Parent dd9c2b4b8a8a0934d5523c15f2c119b362360903
1739 Added tag one, one.patch for changeset 97d72e5f12c7
1740
1741 diff -r dd9c2b4b8a8a -r eae5fcf795ee .hgtags
1742 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
1743 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
1744 @@ -1,2 +1,4 @@
1745 8580ff50825a50c8f716709acdf8de0deddcd6ab zero
1746 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
1747 +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
1748 +97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
1749
1750 Displaying [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b ...
1751 Content-Type: text/plain; charset="us-ascii"
1752 MIME-Version: 1.0
1753 Content-Transfer-Encoding: 7bit
1754 Subject: [PATCH 7 of 8] Added tag two, two.diff for changeset ff2c9fa2018b
1755 X-Mercurial-Node: e317db6a6f288748d1f6cb064f3810fcba66b1b6
1756 Message-Id: <e317db6a6f288748d1f6.315532867@
1757 In-Reply-To: <patchbomb.315532860@
1758 References: <patchbomb.315532860@
1759 User-Agent: Mercurial-patchbomb
1760 Date: Tue, 01 Jan 1980 00:01:07 +0000
1761 From: test
1762 To: foo
1763
1764 # HG changeset patch
1765 # User test
1766 # Date 0 0
1767 # Node ID e317db6a6f288748d1f6cb064f3810fcba66b1b6
1768 # Parent eae5fcf795eee29d0e45ffc9f519a91cd79fc9ff
1769 Added tag two, two.diff for changeset ff2c9fa2018b
1770
1771 diff -r eae5fcf795ee -r e317db6a6f28 .hgtags
1772 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000
1773 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000
1774 @@ -2,3 +2,5 @@
1775 8580ff50825a50c8f716709acdf8de0deddcd6ab zero.foo
1776 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one
1777 97d72e5f12c7e84f85064aa72e5a297142c36ed9 one.patch
1778 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two
1779 +ff2c9fa2018b15fa74b33363bda9527323e2a99f two.diff
1780
1781 Displaying [PATCH 8 of 8] d ...
1782 Content-Type: text/plain; charset="us-ascii"
1783 MIME-Version: 1.0
1784 Content-Transfer-Encoding: 7bit
1785 Subject: [PATCH 8 of 8] d
1786 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
1787 Message-Id: <2f9fa9b998c5fe3ac2bd.315532868@
1788 In-Reply-To: <patchbomb.315532860@
1789 References: <patchbomb.315532860@
1790 User-Agent: Mercurial-patchbomb
1791 Date: Tue, 01 Jan 1980 00:01:08 +0000
1792 From: test
1793 To: foo
1794
1795 # HG changeset patch
1796 # User test
1797 # Date 4 0
1798 # Branch test
1799 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
1800 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1801 d
1802
1803 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
1804 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1805 +++ b/d Thu Jan 01 00:00:04 1970 +0000
1806 @@ -0,0 +1,1 @@
1807 +d
1808
1809 % dest#branch URIs
1810 comparing with ../t
1811 searching for changes
1542 1812 This patch series consists of 1 patches.
1543 1813
1544 1814
General Comments 0
You need to be logged in to leave comments. Login now