Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/commands.py @ 4440:eff2eefdb65a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ability to parse branch information to hg import
author Eric Hopper <hopper@omnifarious.org>
date Thu, 17 May 2007 20:09:47 -0700
parents 3900f684a150
children af8db3b42a4a
line wrap: on
line diff
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1516,10 +1516,10 @@ def import_(ui, repo, patch1, *patches, 
 
         if pf == '-':
             ui.status(_("applying patch from stdin\n"))
-            tmpname, message, user, date, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
+            tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
         else:
             ui.status(_("applying %s\n") % p)
-            tmpname, message, user, date, nodeid, p1, p2 = patch.extract(ui, file(pf))
+            tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf))
 
         if tmpname is None:
             raise util.Abort(_('no diffs found'))