Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check that git patches only touch files under root
authorBrendan Cully <brendan@kublai.com>
Wed, 25 Jun 2008 14:13:20 -0700
changeset 6758 87c704ac92d4
parent 6757 55c71226eceb
child 6759 9d2ab50803e9
Check that git patches only touch files under root
mercurial/patch.py file | annotate | diff | comparison | revisions
tests/test-import file | annotate | diff | comparison | revisions
tests/test-import.out file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Thu Jun 26 18:44:54 2008 -0500
+++ b/mercurial/patch.py	Wed Jun 25 14:13:20 2008 -0700
@@ -1039,9 +1039,12 @@
                 continue
         elif state == 'git':
             gitpatches = values
+            cwd = os.getcwd()
             for gp in gitpatches:
                 if gp.op in ('COPY', 'RENAME'):
-                    copyfile(gp.oldpath, gp.path)
+                    src, dst = [util.canonpath(cwd, cwd, x)
+                                for x in [gp.oldpath, gp.path]]
+                    copyfile(src, dst)
                 changed[gp.path] = (gp.op, gp)
         else:
             raise util.Abort(_('unsupported parser state: %s') % state)
--- a/tests/test-import	Thu Jun 26 18:44:54 2008 -0500
+++ b/tests/test-import	Wed Jun 25 14:13:20 2008 -0700
@@ -261,3 +261,15 @@
 hg status
 cat a
 cd ..
+
+echo % 'test paths outside repo root'
+mkdir outside
+touch outside/foo
+hg init inside
+cd inside
+hg import - <<EOF
+diff --git a/a b/b
+rename from ../outside/foo
+rename to bar
+EOF
+cd ..
--- a/tests/test-import.out	Thu Jun 26 18:44:54 2008 -0500
+++ b/tests/test-import.out	Wed Jun 25 14:13:20 2008 -0700
@@ -260,3 +260,6 @@
 adding a
 applying patch from stdin
 bb
+% test paths outside repo root
+applying patch from stdin
+abort: ../outside/foo not under root
Mercurial