##// END OF EJS Templates
patchbomb: handle repository#rev URLs correctly
Sune Foldager -
r10018:4ddfad7e stable
parent child Browse files
Show More
@@ -230,6 +230,7 b' def patchbomb(ui, repo, *revs, **opts):'
230 def outgoing(dest, revs):
230 def outgoing(dest, revs):
231 '''Return the revisions present locally but not in dest'''
231 '''Return the revisions present locally but not in dest'''
232 dest = ui.expandpath(dest or 'default-push', dest or 'default')
232 dest = ui.expandpath(dest or 'default-push', dest or 'default')
233 dest, revs, checkout = hg.parseurl(dest, revs)
233 revs = [repo.lookup(rev) for rev in revs]
234 revs = [repo.lookup(rev) for rev in revs]
234 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
235 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
235 ui.status(_('comparing with %s\n') % dest)
236 ui.status(_('comparing with %s\n') % dest)
@@ -176,3 +176,11 b' export HGENCODING'
176 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \
176 hg email --date '1980-1-1 0:1' -m tmp.mbox -f quux -t "bar@${UUML}nicode.com" \
177 -s test -r 0
177 -s test -r 0
178 cat tmp.mbox | fixheaders
178 cat tmp.mbox | fixheaders
179
180 echo "% test outgoing and dest#branch URIs"
181 hg up 1
182 hg branch test
183 echo d > d
184 hg add d
185 hg ci -md -d '4 0'
186 hg email --date '1980-1-1 0:1' -n -t foo -s test -o ../t#test | fixheaders
@@ -1500,3 +1500,38 b' diff -r 000000000000 -r 8580ff50825a a'
1500 +a
1500 +a
1501
1501
1502
1502
1503 % test outgoing and dest#branch URIs
1504 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
1505 marked working directory as branch test
1506 created new head
1507 comparing with ../t
1508 searching for changes
1509 This patch series consists of 1 patches.
1510
1511
1512 Displaying [PATCH] test ...
1513 Content-Type: text/plain; charset="us-ascii"
1514 MIME-Version: 1.0
1515 Content-Transfer-Encoding: 7bit
1516 Subject: [PATCH] test
1517 X-Mercurial-Node: 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
1518 Message-Id: <2f9fa9b998c5fe3ac2bd.315532860@
1519 User-Agent: Mercurial-patchbomb
1520 Date: Tue, 01 Jan 1980 00:01:00 +0000
1521 From: test
1522 To: foo
1523
1524 # HG changeset patch
1525 # User test
1526 # Date 4 0
1527 # Branch test
1528 # Node ID 2f9fa9b998c5fe3ac2bd9a2b14bfcbeecbc7c268
1529 # Parent 97d72e5f12c7e84f85064aa72e5a297142c36ed9
1530 d
1531
1532 diff -r 97d72e5f12c7 -r 2f9fa9b998c5 d
1533 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1534 +++ b/d Thu Jan 01 00:00:04 1970 +0000
1535 @@ -0,0 +1,1 @@
1536 +d
1537
General Comments 0
You need to be logged in to leave comments. Login now