# HG changeset patch
# User Greg Ward <greg@gerg.ca>
# Date 1317520285 14400
# Node ID 7f78a4137f8f4b8e98dbde62314b325da0b869f4
# Parent  5b2a3bb06cef3c928268c42e199b847b26111746
import: join base with patchurl *after* checking for stdin

This only matters when using the deprecated --base option, and
combining --base with a patch on stdin makes no sense. But it's such
an obvious bug and easy fix that I couldn't pass it by.

diff -r 5b2a3bb06cef -r 7f78a4137f8f mercurial/commands.py
--- a/mercurial/commands.py	Sat Oct 01 21:49:04 2011 -0400
+++ b/mercurial/commands.py	Sat Oct 01 21:51:25 2011 -0400
@@ -3372,11 +3372,11 @@
         lock = repo.lock()
         parents = repo.parents()
         for patchurl in patches:
-            patchurl = os.path.join(base, patchurl)
             if patchurl == '-':
                 ui.status(_('applying patch from stdin\n'))
                 patchfile = ui.fin
             else:
+                patchurl = os.path.join(base, patchurl)
                 ui.status(_('applying %s\n') % patchurl)
                 patchfile = url.open(ui, patchurl)